phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] etemplate index.php phpGtk_test.php process_exe...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] etemplate index.php phpGtk_test.php process_exe...
Date: Sat, 10 Feb 2007 16:03:47 +0000

CVSROOT:        /sources/phpgroupware
Module name:    etemplate
Changes by:     Sigurd Nes <sigurdne>   07/02/10 16:03:46

Modified files:
        .              : index.php phpGtk_test.php process_exec.php 
        doc            : etemplate.html referenz.html 
        doc/et_media   : index.php 
        doc/et_media/inc: class.et_media.inc.php 
        doc/et_media/setup: phpgw_de.lang phpgw_fr.lang setup.inc.php 
        doc/et_notes   : index.php 
        doc/et_notes/inc: class.bo.inc.php class.so.inc.php 
                          class.ui.inc.php hook_add_def_pref.inc.php 
                          hook_admin.inc.php hook_deleteaccount.inc.php 
        doc/et_notes/setup: phpgw_de.lang phpgw_fr.lang setup.inc.php 
                            tables_current.inc.php 
        inc            : class.boetemplate.inc.php 
                         class.date_widget.inc.php 
                         class.db_tools.inc.php class.editor.inc.php 
                         class.etemplate.inc.php class.html.inc.php 
                         class.link_widget.inc.php 
                         class.nextmatch_widget.inc.php 
                         class.sbox2.inc.php class.select_widget.inc.php 
                         class.so_sql.inc.php class.soetemplate.inc.php 
                         class.solangfile.inc.php 
                         class.tab_widget.inc.php 
                         class.uietemplate.inc.php 
                         class.uietemplate_gtk.inc.php 
                         class.xmltool.inc.php class.xslt_widget.inc.php 
                         class.xul_io.inc.php get_var.php 
        setup          : etemplates.inc.php phpgw_de.lang phpgw_fr.lang 
                         phpgw_tr.lang setup.inc.php 
                         tables_baseline.inc.php tables_current.inc.php 
                         tables_update.inc.php 
        templates/base : disable_test.xet editor.cell.vbox.xet 
                         editor.xet link_widget.attach.xet 
                         link_widget.create.xet link_widget.list.xet 
                         link_widget.search.xet nextmatch_widget.xet 
                         test.xsl vbox.test.xet 
        templates/idots/images: navbar.png 
Added files:
        js             : etemplate.js 
        setup          : phpgw_ja.lang 

Log message:
        start over from latest .16

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/etemplate/index.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/etemplate/phpGtk_test.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/etemplate/process_exec.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/etemplate.html?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/referenz.html?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_media/index.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_media/inc/class.et_media.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_media/setup/phpgw_de.lang?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_media/setup/phpgw_fr.lang?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_media/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/index.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/class.bo.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/class.so.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/class.ui.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/hook_add_def_pref.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/inc/hook_deleteaccount.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/setup/phpgw_de.lang?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/setup/phpgw_fr.lang?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/etemplate/doc/et_notes/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.boetemplate.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.date_widget.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.db_tools.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.editor.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.etemplate.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.html.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.link_widget.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.nextmatch_widget.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.sbox2.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.select_widget.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.so_sql.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.soetemplate.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.solangfile.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.tab_widget.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.uietemplate.inc.php?cvsroot=phpgroupware&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.uietemplate_gtk.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.xmltool.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.xslt_widget.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.xul_io.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/get_var.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/js/etemplate.js?cvsroot=phpgroupware&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/etemplates.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/phpgw_de.lang?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/phpgw_fr.lang?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/phpgw_tr.lang?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/tables_baseline.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/etemplate/setup/phpgw_ja.lang?cvsroot=phpgroupware&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/disable_test.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/editor.cell.vbox.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/editor.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/link_widget.attach.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/link_widget.create.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/link_widget.list.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/link_widget.search.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/nextmatch_widget.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/test.xsl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/vbox.test.xet?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/idots/images/navbar.png?cvsroot=phpgroupware&rev=1.4

Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- index.php   28 Sep 2006 12:53:49 -0000      1.6
+++ index.php   10 Feb 2007 16:03:45 -0000      1.7
@@ -13,14 +13,13 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: index.php,v 1.6 2006/09/28 12:53:49 skwashd Exp $ */
+ /* $Id: index.php,v 1.7 2007/02/10 16:03:45 sigurdne Exp $ */
 
-       $GLOBALS['phpgw_info']['flags'] = array
-       (
+       $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'    => 'etemplate',
                'noheader'              => True,
                'nonavbar'              => True
        );
-       include_once('../header.inc.php');
+       include('../header.inc.php');
 
-       $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'etemplate.editor.edit') );
+       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=etemplate.editor.edit');

Index: phpGtk_test.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/phpGtk_test.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- phpGtk_test.php     6 Sep 2006 11:13:30 -0000       1.4
+++ phpGtk_test.php     10 Feb 2007 16:03:45 -0000      1.5
@@ -15,7 +15,7 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: phpGtk_test.php,v 1.4 2006/09/06 11:13:30 skwashd Exp $ */
+ /* $Id: phpGtk_test.php,v 1.5 2007/02/10 16:03:45 sigurdne Exp $ */
 
 //echo "Hello World!!!\n";
 

Index: process_exec.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/process_exec.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- process_exec.php    6 Sep 2006 11:13:30 -0000       1.4
+++ process_exec.php    10 Feb 2007 16:03:45 -0000      1.5
@@ -13,7 +13,7 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: process_exec.php,v 1.4 2006/09/06 11:13:30 skwashd Exp $ */
+ /* $Id: process_exec.php,v 1.5 2007/02/10 16:03:45 sigurdne Exp $ */
 
        list($app) = explode('.',$_GET['menuaction']);
 

Index: doc/etemplate.html
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/etemplate.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- doc/etemplate.html  6 Sep 2006 11:13:30 -0000       1.20
+++ doc/etemplate.html  10 Feb 2007 16:03:45 -0000      1.21
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- $Id: etemplate.html,v 1.20 2006/09/06 11:13:30 skwashd Exp $ -->
+<!-- $Id: etemplate.html,v 1.21 2007/02/10 16:03:45 sigurdne Exp $ -->
 <html>
 <head>
   <title>phpGroupware: eTemplates - Templates and Dialog-Editor</title>

Index: doc/referenz.html
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/referenz.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- doc/referenz.html   6 Sep 2006 11:13:30 -0000       1.14
+++ doc/referenz.html   10 Feb 2007 16:03:45 -0000      1.15
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>phpGroupware: eTemplate-Referenz</title>
-<!-- $Id: referenz.html,v 1.14 2006/09/06 11:13:30 skwashd Exp $ -->
+<!-- $Id: referenz.html,v 1.15 2007/02/10 16:03:45 sigurdne Exp $ -->
 <STYLE type="text/css">
 <!--
 pre { font-family: monospace; background-color: #e0e0e0; padding: 2mm; 
border-width: thin; border-style: solid; border-color: black; white-space: pre; 
}
@@ -37,7 +37,7 @@
 <a href="show.gif">show-function</a>):</p>
 <pre>
 &lt;?xml version="1.0"?>
-<span>&lt;!-- $Id: referenz.html,v 1.14 2006/09/06 11:13:30 skwashd Exp $ 
--></span>
+<span>&lt;!-- $Id: referenz.html,v 1.15 2007/02/10 16:03:45 sigurdne Exp $ 
--></span>
 &lt;overlay>
   &lt;grid id="et_media.edit" template="" lang="" group="" version="" 
width="100%">
     &lt;columns>

Index: doc/et_media/index.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_media/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/et_media/index.php      24 Jan 2007 17:17:34 -0000      1.5
+++ doc/et_media/index.php      10 Feb 2007 16:03:45 -0000      1.6
@@ -13,7 +13,7 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: index.php,v 1.5 2007/01/24 17:17:34 Caeies Exp $ */
+ /* $Id: index.php,v 1.6 2007/02/10 16:03:45 sigurdne Exp $ */
 
        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'    => 'et_media',
@@ -22,6 +22,6 @@
        );
        include('../header.inc.php');
 
-       header('Location: '.$GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'et_media.et_media.edit')));
+       header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=et_media.et_media.edit'));
        $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
        exit;

Index: doc/et_media/inc/class.et_media.inc.php
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/doc/et_media/inc/class.et_media.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/et_media/inc/class.et_media.inc.php     6 Sep 2006 11:13:30 -0000       
1.6
+++ doc/et_media/inc/class.et_media.inc.php     10 Feb 2007 16:03:45 -0000      
1.7
@@ -1,11 +1,19 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.et_media.inc.php,v 1.6 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.et_media.inc.php,v 1.7 2007/02/10 16:03:45 sigurdne Exp $ */
 
        include_once(PHPGW_INCLUDE_ROOT . 
'/etemplate/inc/class.so_sql.inc.php');
        $GLOBALS['phpgw_info']['flags']['included_classes']['so_sql'] = True; 
// for 0.9.14
@@ -22,7 +30,7 @@
 
                function et_media()
                {
-                       $this->tmpl = 
createObject('etemplate.etemplate','et_media.edit');
+                       $this->tmpl = 
CreateObject('etemplate.etemplate','et_media.edit');
 
                        $this->so_sql('et_media','phpgw_et_media');     // sets 
up our storage layer using the table 'phpgw_et_media'
                        $this->empty_on_write = "''";   // that means if a 
column is empty how to write in the db, the default is NULL
@@ -124,11 +132,11 @@
                        $this->tmpl->exec('et_media.et_media.edit',$content);
                }
 
-               /**
-                * writes langfile with all templates and types here
-               *
-                * can be called via [write Langfile] in the eTemplate editor or
-                * 
http://domain/phpgroupware/index.php?et_media.et_media.writeLangFile
+               /*!
+               @function writeLangFile
+               @abstract writes langfile with all templates and types here
+               @discussion can be called via [write Langfile] in the eTemplate 
editor or
+               @discussion 
http://domain/phpgroupware/index.php?et_media.et_media.writeLangFile
                 */
                function writeLangFile()
                {

Index: doc/et_media/setup/phpgw_de.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_media/setup/phpgw_de.lang,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_media/setup/phpgw_de.lang    22 Feb 2006 06:10:03 -0000      1.2
+++ doc/et_media/setup/phpgw_de.lang    10 Feb 2007 16:03:45 -0000      1.3
@@ -1,10 +1,10 @@
 %d matches on search criteria  et_media        de      %d Ergebnisse bei der 
Suche
 author et_media        de      Author
 book   et_media        de      Buch
-clears the form, without changing anything     et_media        de      Löscht 
das Formular ohne etwas zu ändern
-click here to edit the entry   et_media        de      hier clicken um den 
Eintrag zu ändern
+clears the form, without changing anything     et_media        de      Löscht 
das Formular ohne etwas zu ändern
+click here to edit the entry   et_media        de      hier clicken um den 
Eintrag zu ändern
 compact disc   et_media        de      Compact Disk
-deletes an entry       et_media        de      löscht einen Eintrag
+deletes an entry       et_media        de      löscht einen Eintrag
 description    et_media        de      Beschreibung
 dvd    et_media        de      DVD
 entry saved    et_media        de      Eintrag gesichert
@@ -12,12 +12,12 @@
 et_media       common  de      eTemplates MedienDB
 etemplates mediadb     et_media        de      eTemplates MedienDB
 here goes the name of the publication / record et_media        de      hierhin 
kommt der name der Publikation
-nothing matched search criteria !!!    et_media        de      Keine Einträge 
zu diesen Suchbegriffen !!!
+nothing matched search criteria !!!    et_media        de      Keine Einträge 
zu diesen Suchbegriffen !!!
 please use name, first name    et_media        de      bitte benutzen sie 
Name, Vorname
-reads or searches for entries matching the criteria above      et_media        
de      Liest oder Sucht nach Einträgen die den obigen Kriterien entsprechen
-saves the change to the db     et_media        de      sichert die Änderungen 
in der Datenbank
-select one ... et_media        de      Eine auswählen ...
-select the type fitting most   et_media        de      den zutreffensten Typ 
auswählen
+reads or searches for entries matching the criteria above      et_media        
de      Liest oder Sucht nach Einträgen die den obigen Kriterien entsprechen
+saves the change to the db     et_media        de      sichert die Änderungen 
in der Datenbank
+select one ... et_media        de      Eine auswählen ...
+select the type fitting most   et_media        de      den zutreffensten Typ 
auswählen
 type   et_media        de      Typ
 video tape     et_media        de      Videoband
 we have a fulltext search using that description       et_media        de      
wir haben eine Volltextsuche die diese Beschreibung nutzt

Index: doc/et_media/setup/phpgw_fr.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_media/setup/phpgw_fr.lang,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/et_media/setup/phpgw_fr.lang    22 Feb 2006 06:08:24 -0000      1.4
+++ doc/et_media/setup/phpgw_fr.lang    10 Feb 2007 16:03:45 -0000      1.5
@@ -1,29 +1,29 @@
-%d matches on search criteria  et_media        fr      %d occurences sur les 
critères de recherche
+%d matches on search criteria  et_media        fr      %d occurences sur les 
critères de recherche
 author et_media        fr      Auteur
 book   et_media        en      Book
 cancel et_media        fr      Annuler
-clears the form, without changing anything     et_media        fr      Remet à
 vide le formulaire, sans rien changer
-click here to edit the entry   et_media        fr      Cliquez ici pour 
modifier l'entrée
+clears the form, without changing anything     et_media        fr      Remet à 
vide le formulaire, sans rien changer
+click here to edit the entry   et_media        fr      Cliquez ici pour 
modifier l'entrée
 compact disc   et_media        en      Compact Disc
 delete et_media        fr      Effacer
-deletes an entry       et_media        fr      Efface une entrée
+deletes an entry       et_media        fr      Efface une entrée
 description    et_media        fr      Description
 dvd    et_media        en      DVD
 edit   et_media        fr      Modifier
-entry saved    et_media        fr      Entrée enregistrée
-error: writeing !!!    et_media        fr      Erreur: à l'écriture !!!
+entry saved    et_media        fr      Entrée enregistrée
+error: writeing !!!    et_media        fr      Erreur: à l'écriture !!!
 et_media       common  fr      eTemplates MediaDB
 etemplates mediadb     et_media        fr      eTemplates MediaDB
 here goes the name of the publication / record et_media        fr      Ici on 
met le nom de la publication / l'enregistrement
 name   et_media        fr      Nom
-nothing matched search criteria !!!    et_media        fr      Aucune 
occurence sur les critères de recherche !!!
-please use name, first name    et_media        fr      SVP utilisez nom, 
prénom
+nothing matched search criteria !!!    et_media        fr      Aucune 
occurence sur les critères de recherche !!!
+please use name, first name    et_media        fr      SVP utilisez nom, prénom
 read   et_media        fr      Lire
-reads or searches for entries matching the criteria above      et_media        
fr      Lit ou recherche des entrées qui correspondent aux critères ci-dessus
+reads or searches for entries matching the criteria above      et_media        
fr      Lit ou recherche des entrées qui correspondent aux critères ci-dessus
 save   et_media        fr      Enregistrer
-saves the change to the db     et_media        fr      Enregistre les 
changements dans la base de données
+saves the change to the db     et_media        fr      Enregistre les 
changements dans la base de données
 select one ... et_media        en      Select one ...
 select the type fitting most   et_media        fr      Choisissez le type qui 
correspond le mieux
 type   et_media        fr      Type
 video tape     et_media        en      Video Tape
-we have a fulltext search using that description       et_media        fr      
Nous avons une recherche en texte intégral qui utilise cette description
+we have a fulltext search using that description       et_media        fr      
Nous avons une recherche en texte intégral qui utilise cette description

Index: doc/et_media/setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_media/setup/setup.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- doc/et_media/setup/setup.inc.php    6 Sep 2006 11:13:30 -0000       1.8
+++ doc/et_media/setup/setup.inc.php    10 Feb 2007 16:03:45 -0000      1.9
@@ -1,13 +1,19 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: setup.inc.php,v 1.8 2006/09/06 11:13:30 skwashd Exp $
-*/
-
-//TODO document this file properly
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: setup.inc.php,v 1.9 2007/02/10 16:03:45 sigurdne Exp $ */
 
        $setup_info['et_media']['name']      = 'et_media';
        $setup_info['et_media']['title']     = 'eT-Media';
@@ -15,15 +21,10 @@
        $setup_info['et_media']['app_order'] = 100;     // at the end
        $setup_info['et_media']['tables']    = array('phpgw_et_media');
        $setup_info['et_media']['enable']    = 1;
-       $setup_info['et_media']['app_group']    = 'other';
-       
-       $setup_info['et_media']['author'] = array(
-               'name'  => 'Ralf Becker',
-               'email' => 'address@hidden'
-       );
+       $setup_info['et_media']['author'] = 
        $setup_info['et_media']['maintainer'] = array(
-               'name'  => 'Benoit Hamet',
-               'email' => 'address@hidden'
+               'name'  => 'Unmaintained',
+               'email' => 'phpgroupware-developers at gnu.org'
        );
        $setup_info['et_media']['license']   = 'GPL';
        $setup_info['et_media']['description'] =
@@ -36,9 +37,9 @@
        /* Dependencies for this app to work */
        $setup_info['et_media']['depends'][] = array(
                                'appname' => 'phpgwapi',
-                               'versions' => Array('0.9.17', '0.9.18')
+                               'versions' => Array('0.9.13','0.9.14','0.9.15')
        );
        $setup_info['et_media']['depends'][] = array(   // this is only 
necessary as long the etemplate-class is not in the api
                                'appname' => 'etemplate',
-                               'versions' => Array('0.9.15', '0.9.16', 
'0.9.17', '0.9.18')
+                               'versions' => Array('0.9.13','0.9.14','0.9.15')
        );

Index: doc/et_notes/index.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/et_notes/index.php      24 Jan 2007 17:17:34 -0000      1.3
+++ doc/et_notes/index.php      10 Feb 2007 16:03:45 -0000      1.4
@@ -14,7 +14,7 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: index.php,v 1.3 2007/01/24 17:17:34 Caeies Exp $ */
+ /* $Id: index.php,v 1.4 2007/02/10 16:03:45 sigurdne Exp $ */
 
        $GLOBALS['phpgw_info']['flags'] = array
        (
@@ -24,6 +24,6 @@
        );
        include('../header.inc.php');
 
-       header('Location: '.$GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'et_notes.ui.index')));
+       header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction=et_notes.ui.index'));
        $GLOBALS['phpgw']->common->phpgw_exit();
 ?>

Index: doc/et_notes/inc/class.bo.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/inc/class.bo.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/inc/class.bo.inc.php   6 Sep 2006 11:13:30 -0000       1.2
+++ doc/et_notes/inc/class.bo.inc.php   10 Feb 2007 16:03:46 -0000      1.3
@@ -1,15 +1,17 @@
 <?php
-/**
-* eTemplate Notes - port of the notes application
-* @author Bettina Gille <address@hidden>
-* @author Andy Holman LoCdOg
-* @author Ralf Becker <address@hidden>
-* @copyright Copyright (c) ??? Andy Holman - LoCdOg
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.bo.inc.php,v 1.2 2006/09/06 11:13:30 skwashd Exp $
-*/
+       
/***************************************************************************\
+       * phpGroupWare - Notes eTemplate Port                                   
    *
+       * http://www.phpgroupware.org                                           
    *
+       * Written by : Andy Holman (LoCdOg)                                     
    *
+       *              Bettina Gille address@hidden                         *
+       * Ported to eTemplate by Ralf Becker address@hidden       *
+       * -------------------------------------------------                     
    *
+       * This program is free software; you can redistribute it and/or modify 
it   *
+       * under the terms of the GNU General Public License as published by the 
    *
+       * Free Software Foundation; either version 2 of the License, or (at 
your    *
+       * option) any later version.                                            
    *
+       
\***************************************************************************/
+       /* $Id: class.bo.inc.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
 
        class bo
        {
@@ -53,7 +55,7 @@
 
                function bo($session=False)
                {
-                       $this->so = createObject('et_notes.so');
+                       $this->so = CreateObject('et_notes.so');
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $this->grants           = 
$GLOBALS['phpgw']->acl->get_grants('et_notes');
                        $this->grants[$this->account] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;

Index: doc/et_notes/inc/class.so.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/inc/class.so.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/inc/class.so.inc.php   6 Sep 2006 11:13:30 -0000       1.2
+++ doc/et_notes/inc/class.so.inc.php   10 Feb 2007 16:03:46 -0000      1.3
@@ -1,21 +1,29 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @author Bettina Gille <address@hidden>
-* @author Ralf Becker <address@hidden>
-* @package etemplate
-* @version $Id: class.so.inc.php,v 1.2 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Bettina Gille - <ceb at phpgroupware.org>     *
+ * Contibutions form Ralf Becker - <address@hidden>    *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.so.inc.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
+
        class so
        {
                var $grants;
 
                function so()
                {
-                       $this->db     =& $GLOBALS['phpgw']->db;
-                       $this->db2    = clone($this->db);
+                       $this->db     = $GLOBALS['phpgw']->db;
+                       $this->db2    = $this->db;
                        $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('et_notes');
                        $this->owner  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                }

Index: doc/et_notes/inc/class.ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/inc/class.ui.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/et_notes/inc/class.ui.inc.php   28 Dec 2006 11:38:47 -0000      1.3
+++ doc/et_notes/inc/class.ui.inc.php   10 Feb 2007 16:03:46 -0000      1.4
@@ -1,14 +1,18 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @author Bettina Gille <address@hidden>
-* @author Andy Holman LoCdog
-* @author Ralf Becker <address@hidden>
-* @package etemplate
-* @version $Id: class.ui.inc.php,v 1.3 2006/12/28 11:38:47 Caeies Exp $
-*/
+       
/***************************************************************************\
+       * phpGroupWare - Notes eTemplate Port                                   
    *
+       * http://www.phpgroupware.org                                           
    *
+       * Written by : Bettina Gille address@hidden                         *
+       *              Andy Holman (LoCdOg)                                     
    *
+       * Ported to eTemplate by Ralf Becker address@hidden       *
+       * -------------------------------------------------                     
    *
+       * This program is free software; you can redistribute it and/or modify 
it   *
+       * under the terms of the GNU General Public License as published by the 
    *
+       * Free Software Foundation; either version 2 of the License, or (at 
your    *
+       * option) any later version.                                            
    *
+       
\***************************************************************************/
+       /* $Id: class.ui.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $ */
+
        class ui
        {
                var $grants;
@@ -27,10 +31,10 @@
 
                function ui()
                {
-                       $this->cats                     = 
createObject('phpgwapi.categories');
+                       $this->cats                     = 
CreateObject('phpgwapi.categories');
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
-                       $this->tpl                      = 
createObject('etemplate.etemplate','et_notes.edit');
-                       $this->bo                       = 
createObject('et_notes.bo',True);
+                       $this->tpl                      = 
CreateObject('etemplate.etemplate','et_notes.edit');
+                       $this->bo                       = 
CreateObject('et_notes.bo',True);
 
                        $this->session_data = array(
                                'start' => $this->bo->start,
@@ -66,7 +70,7 @@
                                }
                                elseif ($values['cats'])
                                {
-                                       Header('Location: ' 
.$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'preferences.uicategories.index', 'cats_app' => 'et_notes', 'cats_level' => 
'True', 'global_cats' => 'True')));
+                                       Header('Location: ' 
.$GLOBALS['phpgw']->link('/index.php?menuaction=preferences.uicategories.index&cats_app=et_notes&cats_level=True&global_cats=True'));
                                        $GLOBALS['phpgw']->common->phpgw_exit();
                                }
                                elseif (isset($values['nm']['rows']['view']))
@@ -144,7 +148,7 @@
                        }
                        elseif($values['cats'])
                        {
-                               Header('Location: ' 
.$GLOBALS['phpgw']->link('/index.php', 
array('menuaction'=>'preferences.uicategories.index', 'cats_app' => 'et_notes', 
'cats_level'=>'True', 'global_cats' => 'True')));
+                               Header('Location: ' 
.$GLOBALS['phpgw']->link('/index.php?menuaction=preferences.uicategories.index&cats_app=et_notes&cats_level=True&global_cats=True'));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        if ($view)

Index: doc/et_notes/inc/hook_add_def_pref.inc.php
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/doc/et_notes/inc/hook_add_def_pref.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/et_notes/inc/hook_add_def_pref.inc.php  6 Sep 2006 11:35:33 -0000       
1.3
+++ doc/et_notes/inc/hook_add_def_pref.inc.php  10 Feb 2007 16:03:46 -0000      
1.4
@@ -1,12 +1,20 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Bettina Gille <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: hook_add_def_pref.inc.php,v 1.3 2006/09/06 11:35:33 skwashd 
Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Bettina Gille - <ceb at phpgroupware.org>     *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: hook_add_def_pref.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $ */
+
        global $pref;
        
$pref->change('notes','notes_font','Verdana,Arial,Helvetica,sans-serif');
        $pref->change('notes','notes_font_size','3');

Index: doc/et_notes/inc/hook_admin.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/inc/hook_admin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/et_notes/inc/hook_admin.inc.php 24 Jan 2007 17:17:34 -0000      1.3
+++ doc/et_notes/inc/hook_admin.inc.php 10 Feb 2007 16:03:46 -0000      1.4
@@ -1,16 +1,21 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Joseph Engo <address@hidden>
-* @author Joseph Engo <address@hidden>
-* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public 
License
-* @package etemplate
-* @version $Id: hook_admin.inc.php,v 1.3 2007/01/24 17:17:34 Caeies Exp $
-*/
+       
/**************************************************************************\
+       * phpGroupWare                                                          
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Written by Joseph Engo <address@hidden>                          *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+       // $Id: hook_admin.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $
+       // $Source: 
/sources/phpgroupware/etemplate/doc/et_notes/inc/hook_admin.inc.php,v $
+
        {
                $values = array
                (
-                       'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicategories.index', 'appname' => $appname, 'global_cats' => 'True'))
+                       'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True')
                );
 
                display_section($appname,$appname,$values);

Index: doc/et_notes/inc/hook_deleteaccount.inc.php
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/doc/et_notes/inc/hook_deleteaccount.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/inc/hook_deleteaccount.inc.php 6 Sep 2006 11:13:30 -0000       
1.2
+++ doc/et_notes/inc/hook_deleteaccount.inc.php 10 Feb 2007 16:03:46 -0000      
1.3
@@ -1,15 +1,23 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2003 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @author Mark Peters <address@hidden>
-* @package etemplate
-* @version $Id: hook_deleteaccount.inc.php,v 1.2 2006/09/06 11:13:30 skwashd 
Exp $
-*/     
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Mark Peters - <skeeter at phpgroupware.org>   *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: hook_deleteaccount.inc.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
+       
        // Delete all records for a user
        $table_locks = Array('phpgw_et_notes');
-       $db2 =& $GLOBALS['phpgw']->db;
+       $db2 = $GLOBALS['phpgw']->db;
        $db2->lock($table_locks);
 
        if ( $_POST['new_owner'] == 0 )

Index: doc/et_notes/setup/phpgw_de.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/setup/phpgw_de.lang,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/setup/phpgw_de.lang    22 Feb 2006 06:10:03 -0000      1.2
+++ doc/et_notes/setup/phpgw_de.lang    10 Feb 2007 16:03:46 -0000      1.3
@@ -1,30 +1,30 @@
 access et_notes        de      Zugriff
-access for the note    et_notes        de      Zugriffsberechtigung für diese 
Notiz
-add note       et_notes        de      Notiz hinzfügen
-add, edit or delete categories et_notes        de      Hinzufügen, bearbeiten 
oder löschen von Kategorien
-add, edit, delete categories   et_notes        de      Hinzufügen, bearbeiten 
oder löschen von Kategorien
-back to the list       et_notes        de      zurück zur Liste
-back to the notes list et_notes        de      zurück zur Liste der Notizen
-back to the notes list without saveing et_notes        de      zurück zur 
Liste der Notizen ohne zu speichern
+access for the note    et_notes        de      Zugriffsberechtigung für diese 
Notiz
+add note       et_notes        de      Notiz hinzfügen
+add, edit or delete categories et_notes        de      Hinzufügen, bearbeiten 
oder löschen von Kategorien
+add, edit, delete categories   et_notes        de      Hinzufügen, bearbeiten 
oder löschen von Kategorien
+back to the list       et_notes        de      zurück zur Liste
+back to the notes list et_notes        de      zurück zur Liste der Notizen
+back to the notes list without saveing et_notes        de      zurück zur 
Liste der Notizen ohne zu speichern
 categories     et_notes        de      Kategorien
 category       et_notes        de      Kategorie
-clears the form        et_notes        de      löscht das Formular
+clears the form        et_notes        de      löscht das Formular
 content        et_notes        de      Inhalt
-delete this note       et_notes        de      Diese Notiz löschen?
-delete this note?      et_notes        de      Diese Notiz löschen?
-deletes the note       et_notes        de      löscht diese Notiz
+delete this note       et_notes        de      Diese Notiz löschen?
+delete this note?      et_notes        de      Diese Notiz löschen?
+deletes the note       et_notes        de      löscht diese Notiz
 edit the note  et_notes        de      bearbeitet diese Notiz
 edit this note et_notes        de      bearbeitet diese Notiz
 et_notes       common  de      eTemplate Notizen
 note   et_notes        de      Notiz
-notes - delete note    et_notes        de      Notiz - Löschen
+notes - delete note    et_notes        de      Notiz - Löschen
 notes - edit note      et_notes        de      Notiz - Bearbeiten
-notes - list notes for et_notes        de      Notiz - Anzeigen für
+notes - list notes for et_notes        de      Notiz - Anzeigen für
 notes - view note      et_notes        de      Notiz - Anzeigen
 privat et_notes        de      Privat
 private        et_notes        de      Private
 saves the note et_notes        de      speichert diese Notiz
-select the category    et_notes        de      eine Kategorie auswählen
+select the category    et_notes        de      eine Kategorie auswählen
 the content of the note        et_notes        de      der Inhalt dieser Notiz
-to add a new note      et_notes        de      um eine neue Notiz zuzufügen
+to add a new note      et_notes        de      um eine neue Notiz zuzufügen
 view this note et_notes        de      diese Notiz anzeigen

Index: doc/et_notes/setup/phpgw_fr.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/setup/phpgw_fr.lang,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/setup/phpgw_fr.lang    22 Feb 2006 06:08:24 -0000      1.2
+++ doc/et_notes/setup/phpgw_fr.lang    10 Feb 2007 16:03:46 -0000      1.3
@@ -1,13 +1,13 @@
-access et_notes        fr      Accès
-access for the note    et_notes        fr      Accès pour la note
+access et_notes        fr      Accès
+access for the note    et_notes        fr      Accès pour la note
 add note       et_notes        fr      Ajouter une note
-add, edit or delete categories et_notes        fr      Ajouter, modifier ou 
effacer les catégories
-add, edit, delete categories   et_notes        fr      Ajouter, modifier, 
effacer les catégories
-back to the list       et_notes        fr      Retour à la liste
-back to the notes list et_notes        fr      Retour à la liste des notes
-back to the notes list without saveing et_notes        fr      Retour à la 
liste des notes sans enregistrer
-categories     et_notes        fr      Catégories
-category       et_notes        fr      Catégorie
+add, edit or delete categories et_notes        fr      Ajouter, modifier ou 
effacer les catégories
+add, edit, delete categories   et_notes        fr      Ajouter, modifier, 
effacer les catégories
+back to the list       et_notes        fr      Retour à la liste
+back to the notes list et_notes        fr      Retour à la liste des notes
+back to the notes list without saveing et_notes        fr      Retour à la 
liste des notes sans enregistrer
+categories     et_notes        fr      Catégories
+category       et_notes        fr      Catégorie
 clears the form        et_notes        fr      Vide le formulaire
 content        et_notes        fr      Contenu
 delete this note       et_notes        fr      Effacer cette note
@@ -21,10 +21,10 @@
 notes - edit note      et_notes        fr      Notes - Modifier la Note
 notes - list notes for et_notes        fr      Notes - Lister les notes pour
 notes - view note      et_notes        fr      Notes - Voir la note
-privat et_notes        fr      Privé
-private        et_notes        fr      Privé
+privat et_notes        fr      Privé
+private        et_notes        fr      Privé
 saves the note et_notes        fr      Enregistre la Note
-select the category    et_notes        fr      Sélectionner la catégorie
+select the category    et_notes        fr      Sélectionner la catégorie
 the content of the note        et_notes        fr      Le contenu de la note
 to add a new note      et_notes        fr      Pour ajouter une nouvelle note
 view this note et_notes        fr      Voir cette note

Index: doc/et_notes/setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/doc/et_notes/setup/setup.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/et_notes/setup/setup.inc.php    6 Sep 2006 11:13:30 -0000       1.4
+++ doc/et_notes/setup/setup.inc.php    10 Feb 2007 16:03:46 -0000      1.5
@@ -1,20 +1,21 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: setup.inc.php,v 1.4 2006/09/06 11:13:30 skwashd Exp $
-*/
+       
/**************************************************************************\
+       * phpGroupWare - Notes eTemplates Port                                  
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Ported to eTemplate by Ralf Becker address@hidden      *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+       /* $Id: setup.inc.php,v 1.5 2007/02/10 16:03:46 sigurdne Exp $ */
 
        $setup_info['et_notes']['name']      = 'et_notes'; 
        $setup_info['et_notes']['version']   = '0.9.15.001';
        $setup_info['et_notes']['app_order'] = 8;
        $setup_info['et_notes']['tables']    = array('phpgw_et_notes');
        $setup_info['et_notes']['enable']    = 1;
-       $setup_info['et_notes']['app_group']    = 'other';
-       
        $setup_info['et_notes']['licenze']   = 'GPL';
        
        $setup_info['et_notes']['description'] =

Index: doc/et_notes/setup/tables_current.inc.php
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/doc/et_notes/setup/tables_current.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/et_notes/setup/tables_current.inc.php   6 Sep 2006 11:13:30 -0000       
1.2
+++ doc/et_notes/setup/tables_current.inc.php   10 Feb 2007 16:03:46 -0000      
1.3
@@ -1,11 +1,16 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: tables_current.inc.php,v 1.2 2006/09/06 11:13:30 skwashd Exp $
-*/
+  /**************************************************************************\
+  * phpGroupWare - Notes eTemplate Port                                      *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id: tables_current.inc.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
+
        $phpgw_baseline = array(
                'phpgw_et_notes' => array(
                        'fd' => array(

Index: inc/class.boetemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.boetemplate.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.boetemplate.inc.php       8 Feb 2007 14:07:50 -0000       1.40
+++ inc/class.boetemplate.inc.php       10 Feb 2007 16:03:46 -0000      1.41
@@ -1,19 +1,28 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public 
License
-* @package etemplate
-* @version $Id: class.boetemplate.inc.php,v 1.40 2007/02/08 14:07:50 sigurdne 
Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.boetemplate.inc.php,v 1.41 2007/02/10 16:03:46 sigurdne Exp $ */
+
        include_once(PHPGW_INCLUDE_ROOT . 
'/etemplate/inc/class.soetemplate.inc.php');
 
-       /**
-        * Buiseness Objects for eTemplates
-       *
-        * Not so much so far, as the most logic is still in the UI-class
-        * @param $types,$alings converts internal names/values to (more) human 
readible ones
+       /*!
+       @class boetemplate
+       @author ralfbecker
+       @abstract Buiseness Objects for eTemplates
+       @discussion Not so much so far, as the most logic is still in the 
UI-class
+       @param $types,$alings converts internal names/values to (more) human 
readible ones
         */
        class boetemplate extends soetemplate
        {
@@ -40,12 +49,12 @@
                        'hbox'  => 'HBox',                      // a 
(horizontal) box to contain widgets in cols, size = # of cols 
                        'deck'  => 'Deck'                       // a container 
of elements where only one is visible, size = # of elem.
                );
-               /**
-                * constructor of class
-               *
-                * @param $name     name of etemplate or array with name and 
other keys
-                * @param $load_via name/array with keys of other etemplate to 
load in order to get $name
-                * Calls the constructor of soetemplate
+               /*!
+               @function boetemplate
+               @abstract constructor of class
+               @param $name     name of etemplate or array with name and other 
keys
+               @param $load_via name/array with keys of other etemplate to 
load in order to get $name
+               @discussion Calls the constructor of soetemplate
                 */
                function boetemplate($name='',$load_via='')
                {
@@ -77,36 +86,34 @@
                        }
                }
 
-               /**
-                * allows a few variables (eg. row-number) to be used in 
field-names
-                *
-                * This is mainly used for autorepeat, but other use is 
possible.
-                * You need to be aware of the rules PHP uses to expand vars in 
strings, a name
-                * of "Row$row[length]" will expand to 'Row' as $row is scalar, 
you need to use
-                * "Row${row}[length]" instead. Only one indirection is allowd 
in a string by php !!!
-                * Out of that reason we have now the variable $row_cont, which 
is $cont[$row] too.
-                * Attention !!!
-                * Using only number as index in field-names causes a lot 
trouble, as depending
-                * on the variable type (which php determines itself) you used 
filling and later
-                * accessing the array it can by the index or the key of an 
array element.
-                * To make it short and clear, use "Row$row" or "$col$row" not 
"$row" or "$row$col" !!!
-                * @param $name the name to expand
-                * @param $c is the column index starting with 0 (if you have 
row-headers, data-cells start at 1)
-                * @param $row is the row number starting with 0 (if you have 
col-headers, data-cells start at 1)
-                * @param $c_, $row_ are the respective values of the previous 
template-inclusion,
-                * @param            eg. the column-headers in the 
eTemplate-editor are templates itself,
-                * @param            to show the column-name in the header you 
can not use $col as it will
-                * @param            be constant as it is always the same col 
in the header-template,
-                * @param            what you want is the value of the previous 
template-inclusion.
-                * @param $cont content array of the template, you might use it 
to generate button-names with
-                * @param       id values in it: "del[$cont[id]]" expands to 
"del[123]" if $cont = array('id' => 123)
+               /*!
+               @function expand_name
+               @syntax expand_name( $name,$c,$row,$c_='',$row_='',$cont='' )
+               @author ralfbecker
+               @abstract allows a few variables (eg. row-number) to be used in 
field-names
+               @discussion This is mainly used for autorepeat, but other use 
is possible.
+               @discussion You need to be aware of the rules PHP uses to 
expand vars in strings, a name
+               @discussion of "Row$row[length]" will expand to 'Row' as $row 
is scalar, you need to use
+               @discussion "Row${row}[length]" instead. Only one indirection 
is allowd in a string by php !!!
+               @discussion Out of that reason we have now the variable 
$row_cont, which is $cont[$row] too.
+               @discussion Attention !!!
+               @discussion Using only number as index in field-names causes a 
lot trouble, as depending
+               @discussion on the variable type (which php determines itself) 
you used filling and later
+               @discussion accessing the array it can by the index or the key 
of an array element.
+               @discussion To make it short and clear, use "Row$row" or 
"$col$row" not "$row" or "$row$col" !!!
+               @param $name the name to expand
+               @param $c is the column index starting with 0 (if you have 
row-headers, data-cells start at 1)
+               @param $row is the row number starting with 0 (if you have 
col-headers, data-cells start at 1)
+               @param $c_, $row_ are the respective values of the previous 
template-inclusion,
+               @param            eg. the column-headers in the 
eTemplate-editor are templates itself,
+               @param            to show the column-name in the header you can 
not use $col as it will
+               @param            be constant as it is always the same col in 
the header-template,
+               @param            what you want is the value of the previous 
template-inclusion.
+               @param $cont content array of the template, you might use it to 
generate button-names with
+               @param       id values in it: "del[$cont[id]]" expands to 
"del[123]" if $cont = array('id' => 123)
                 */
                function expand_name($name,$c,$row,$c_='',$row_='',$cont='')
                {
-                       if(empty($name))
-                       {
-                               return '';
-                       }
                        if (strstr($name,'$') !== False)
                        {
                                if (!$cont)
@@ -115,8 +122,8 @@
                                }
                                $col = $this->num2chrs($c-1);   // $c-1 to get: 
0:'@', 1:'A', ...
                                $col_ = $this->num2chrs($c_-1);
-                               $row_cont = isset($cont[$row]) ? $cont[$row] : 
0;
-                               $col_row_cont = isset($cont[$col.$row]) ? 
$cont[$col.$row] : 0;
+                               $row_cont = $cont[$row];
+                               $col_row_cont = $cont[$col.$row];
 
                                eval('$name = "'.$name.'";');
                        }
@@ -127,45 +134,32 @@
                        return $name;
                }
 
-               /**
-                * Checks if we have an row- or column autorepeat and sets the 
indexes for $content, etc.
-               *
-                * Autorepeat is important to allow a variable numer of rows or 
cols, eg. for a list.
-                * The eTemplate has only one (have to be the last) row or 
column, which gets
-                * automaticaly repeated as long as content is availible. To 
check this the content
-                * has to be in an sub-array of content. The index / subscript 
into content is
-                * determined by the content of size for templates or name for 
regular fields.
-                * An autorepeat is defined by an index which contains 
variables to expand.
-                * (vor variable expansion in names see expand_names). Usually 
I use the keys
-                * $row: 0, 1, 2, 3, ... for only rows, $col: '@', 'A', 'B', 
'C', ... for only cols or
-                * $col$row: '@0','A0',... '@1','A1','B1',... 
'@2','A2','B2',... for both rows and cells.
-                * In general everything expand_names can generate is ok - see 
there.
-                * As you usually have col- and row-headers, data-cells start 
with '1' or 'A' !!!
-                * @param $cell array with data of cell: name, type, size, ...
-                * @param $c,$r col/row index starting from 0
-                * @param &$idx returns the index in $content and $readonlys 
(NOT $sel_options !!!)
-                * @param &$idx_cname returns the basename for the form-name: 
is $idx if only one value
-                * @param       (no ',') is given in size (name (not 
template-fields) are always only one value)
-                * @param $check_col boolean to check for col- or row-autorepeat
-                * @return true if cell is autorepeat (has index with vars / 
'$') or false otherwise
+               /*!
+               @function autorepeat_idx
+               @abstract Checks if we have an row- or column autorepeat and 
sets the indexes for $content, etc.
+               @discussion Autorepeat is important to allow a variable numer 
of rows or cols, eg. for a list.
+               @discussion The eTemplate has only one (have to be the last) 
row or column, which gets
+               @discussion automaticaly repeated as long as content is 
availible. To check this the content
+               @discussion has to be in an sub-array of content. The index / 
subscript into content is
+               @discussion determined by the content of size for templates or 
name for regular fields.
+               @discussion An autorepeat is defined by an index which contains 
variables to expand.
+               @discussion (vor variable expansion in names see expand_names). 
Usually I use the keys
+               @discussion $row: 0, 1, 2, 3, ... for only rows, $col: '@', 
'A', 'B', 'C', ... for only cols or
+               @discussion $col$row: '@0','A0',... '@1','A1','B1',... 
'@2','A2','B2',... for both rows and cells.
+               @discussion In general everything expand_names can generate is 
ok - see there.
+               @discussion As you usually have col- and row-headers, 
data-cells start with '1' or 'A' !!!
+               @syntax 
autorepeat_idx($cell,$c,$r,&$idx,&$idx_cname,$check_col=False)
+               @param $cell array with data of cell: name, type, size, ...
+               @param $c,$r col/row index starting from 0
+               @param &$idx returns the index in $content and $readonlys (NOT 
$sel_options !!!)
+               @param &$idx_cname returns the basename for the form-name: is 
$idx if only one value
+               @param       (no ',') is given in size (name (not 
template-fields) are always only one value)
+               @param $check_col boolean to check for col- or row-autorepeat
+               @result true if cell is autorepeat (has index with vars / '$') 
or false otherwise
                 */
                function 
autorepeat_idx($cell,$c,$r,&$idx,&$idx_cname,$check_col=False)
                {
-                       $org_idx = $idx = '';
-                       if(isset($cell['type']) && $cell['type'] == 'template')
-                       {
-                               if(isset($cell['size']))
-                               {
-                                       $org_idx = $idx = $cell['size'];
-                               }
-                       }
-                       else
-                       {
-                               if(isset($cell['name']))
-                               {
-                                       $org_idx = $idx = $cell['name'];
-                               }
-                       }
+                       $org_idx = $idx = $cell[ $cell['type'] == 'template' ? 
'size' : 'name' ];
 
                        $idx = $this->expand_name($idx,$c,$r);
                        if (!($komma = strpos($idx,',')))
@@ -201,8 +195,11 @@
                        return $Ok;
                }
 
-               /**
-                * creates a new appsession-id via microtime()
+               /*!
+               @function appsession_id
+               @syntax appsession_id( )
+               @author ralfbecker
+               @abstract creates a new appsession-id via microtime()
                 */
                function appsession_id()
                {
@@ -212,11 +209,11 @@
                        return $id;
                }
 
-               /**
-                * appsession
-                * db-sessions appsession function
-               *
-                * It is used to overcome the problem with overflowing 
php4-sessions
+               /*!
+               @functin appsession
+               @syntax appsession($location = 'default', $appname = '', $data 
= '##NOTHING##')
+               @abstract db-sessions appsession function
+               @note It is used to overcome the problem with overflowing 
php4-sessions
                 */
                function appsession($location = 'default', $appname = '', $data 
= '##NOTHING##')
                {
@@ -293,16 +290,18 @@
                        return $data;
                }
 
-               /**
-                * saves content,readonlys,template-keys, ... via the 
appsession function
-                *
-                * As a user may open several windows with the same 
content/template wie generate a location-id from microtime
-                * which is used as location for appsession to descriminate 
between the different windows. This location-id
-                * is then saved as a hidden-var in the form. The above 
mentions session-id has nothing to do / is different
-                * from the session-id which is constant for all windows opened 
in one session.
-                * @param $data the data to save
-                * @param $id the id to use or '' to generate a new id
-                * @return the location-id
+               /*!
+               @function save_appsession
+               @syntax save_appsession( $data,$id='' )
+               @author ralfbecker
+               @abstract saves content,readonlys,template-keys, ... via the 
appsession function
+               @discussion As a user may open several windows with the same 
content/template wie generate a location-id from microtime
+               @discussion which is used as location for appsession to 
descriminate between the different windows. This location-id
+               @discussion is then saved as a hidden-var in the form. The 
above mentions session-id has nothing to do / is different
+               @discussion from the session-id which is constant for all 
windows opened in one session.
+               @param $data the data to save
+               @param $id the id to use or '' to generate a new id
+               @result the location-id
                 */
                function save_appsession($data,$id='')
                {
@@ -315,11 +314,13 @@
                        return $id;
                }
 
-               /**
-                * gets content,readonlys,template-keys, ... back from the 
appsession function
-                *
-                * @param $id the location-id
-                * @return the session-data
+               /*!
+               @function get_appsession
+               @syntax get_appsession( $id )
+               @author ralfbecker
+               @abstract gets content,readonlys,template-keys, ... back from 
the appsession function
+               @param $id the location-id
+               @result the session-data
                 */
                function get_appsession($id)
                {
@@ -334,10 +335,12 @@
                        return $data;
                }
 
-               /**
-                * gets an attribute in a named cell
-                *
-                * @return the attribute or False if named cell not found
+               /*!
+               @function get_cell_attribute
+               @syntax get_cell_attribute( $name,$attr )
+               @author ralfbecker
+               @abstract gets an attribute in a named cell
+               @result the attribute or False if named cell not found
                 */
                function get_cell_attribute($name,$attr)
                {
@@ -358,10 +361,12 @@
                        return False;
                }
 
-               /**
-                * set an attribute in a named cell
-                *
-                * @return the number of changed cells
+               /*!
+               @function set_cell_attribute
+               @syntax set_cell_attribute( $name,$attr,$val )
+               @author ralfbecker
+               @abstract set an attribute in a named cell
+               @result the number of changed cells
                 */
                function set_cell_attribute($name,$attr,$val)
                {
@@ -372,16 +377,16 @@
                        {
                                foreach($cols as $col => $cell)
                                {
-                                       if (isset($cell['name']) && 
$cell['name'] == $name)
+                                       if ($cell['name'] == $name)
                                        {
                                                $this->data[$row][$col][$attr] 
= $val;
                                                ++$n;
                                        }
-                                       if ($cell['type'] == 'template' && 
isset($cell['obj']) && (is_object($cell['obj']) || $cell['name'][0] != '@'))
+                                       if ($cell['type'] == 'template' && 
(is_object($cell['obj']) || $cell['name'][0] != '@'))
                                        {
                                                if (!is_object($cell['obj']))
                                                {
-                                                       
$this->data[$row][$col]['obj'] = 
createObject('etemplate.etemplate',$cell['name']);
+                                                       
$this->data[$row][$col]['obj'] = 
CreateObject('etemplate.etemplate',$cell['name']);
                                                }
                                                $n += 
$this->data[$row][$col]['obj']->set_cell_attribute($name,$attr,$val);
                                        }
@@ -391,24 +396,28 @@
                        return $n;
                }
 
-               /**
-                * disables all cells with name == $name
-               *
+               /*!
+               @function disable_cells
+               @syntax disable_cells( $name )
+               @author ralfbecker
+               @abstract disables all cells with name == $name
                 */
                function disable_cells($name)
                {
                        return $this->set_cell_attribute($name,'disabled',True);
                }
                
-               /**
-                * set one or more attibutes for row $n
-                *
-                * @param $n is numerical row-number starting with 1 (!)
-                * @param $height in percent or pixel or '' for no height
-                * @param $class name of css class (without the leading '.') or 
'' for no class
-                * @param $valign alignment (top,middle,bottom) or '' for none
-                * @param $disabled True or expression or False to disable or 
enable the row
-                * @param Only the number 0 means dont change the attribute !!!
+               /*!
+               @function set_row_attributes
+               @syntax set_row_attibutes( 
$n,$height=0,$class=0,$valign=0,$disabled=0 )
+               @author ralfbecker
+               @abstract set one or more attibutes for row $n
+               @param $n is numerical row-number starting with 1 (!)
+               @param $height in percent or pixel or '' for no height
+               @param $class name of css class (without the leading '.') or '' 
for no class
+               @param $valign alignment (top,middle,bottom) or '' for none
+               @param $disabled True or expression or False to disable or 
enable the row
+               @param Only the number 0 means dont change the attribute !!!
                 */
                function 
set_row_attributes($n,$height=0,$class=0,$valign=0,$disabled=0)
                {
@@ -422,24 +431,28 @@
                                ($valign ? ','.$valign : '');
                }
 
-               /**
-                * disables row $n
-                *
-                * @param $n is numerical row-number starting with 1 (!)
-                * @param $enable can be used to re-enable a row if set to True
+               /*!
+               @function disable_row
+               @syntax disable_row( $n,$enable=False )
+               @author ralfbecker
+               @abstract disables row $n
+               @param $n is numerical row-number starting with 1 (!)
+               @param $enable can be used to re-enable a row if set to True
                 */
                function disable_row($n,$enable=False)
                {
                        $this->set_row_attributes($n,0,0,0,!$enable);
                }
 
-               /**
-                * set one or more attibutes for column $c
-                *
-                * @param $c is numerical column-number starting with 0 (!), or 
the char-code starting with 'A'
-                * @param $width in percent or pixel or '' for no height
-                * @param $disabled True or expression or False to disable or 
enable the column
-                * @param Only the number 0 means dont change the attribute !!!
+               /*!
+               @function set_column_attributes
+               @syntax set_column_attibutes( $n,$width=0,$disabled=0 )
+               @author ralfbecker
+               @abstract set one or more attibutes for column $c
+               @param $c is numerical column-number starting with 0 (!), or 
the char-code starting with 'A'
+               @param $width in percent or pixel or '' for no height
+               @param $disabled True or expression or False to disable or 
enable the column
+               @param Only the number 0 means dont change the attribute !!!
                 */
                function set_column_attributes($c,$width=0,$disabled=0)
                {
@@ -453,30 +466,35 @@
                                ($disabled ? ','.$disabled : '');
                }
 
-               /**
-                * disables column $c
-                *
-                * @param $c is numerical column-number starting with 0 (!), or 
the char-code starting with 'A'
-                * @param $enable can be used to re-enable a column if set to 
True
+               /*!
+               @function disable_column
+               @syntax disable_column( $c,$enable=False )
+               @author ralfbecker
+               @abstract disables column $c
+               @param $c is numerical column-number starting with 0 (!), or 
the char-code starting with 'A'
+               @param $enable can be used to re-enable a column if set to True
                 */
                function disable_column($c,$enable=False)
                {
                        $this->set_column_attributes($c,0,!$enable);
                }
 
-               /**
-                * trys to load the Extension / Widget-class from the app or 
etemplate
-                * @param $name name of the extension, the classname should be 
class.${name}_widget.inc.php
-                * the $name might be "$name.$app" to give a app-name (default 
is the current app,or template-name)
+               /*!
+               @function loadExtension
+               @syntax loadExtension( $type )
+               @author ralfbecker
+               @abstact trys to load the Extension / Widget-class from the app 
or etemplate
+               @param $name name of the extension, the classname should be 
class.${name}_widget.inc.php
+               @discussion the $name might be "$name.$app" to give a app-name 
(default is the current app,or template-name)
                 */
                function loadExtension($type)
                {
-                       @list($class,$app) = explode('.',$type);
+                       list($class,$app) = explode('.',$type);
                        $class .= '_widget';
 
                        if ($app == '')
                        {
-                               $app = 
isset($GLOBALS['phpgw_info']['flags']['current_app']) ? 
$GLOBALS['phpgw_info']['flags']['current_app'] : '';
+                               $app = 
$GLOBALS['phpgw_info']['flags']['current_app'];
                        }
                        if 
(!file_exists(PHPGW_SERVER_ROOT."/$app/inc/class.$class.inc.php"))
                        {
@@ -490,22 +508,24 @@
                        {
                                return 
$GLOBALS['phpgw_info']['etemplate']['extension'][$type] = False;
                        }
-                       $GLOBALS['phpgw_info']['etemplate']['extension'][$type] 
= createObject($app.'.'.$class,$ui='html');
+                       $GLOBALS['phpgw_info']['etemplate']['extension'][$type] 
= CreateObject($app.'.'.$class,$ui='html');
 
                        return 
$GLOBALS['phpgw_info']['etemplate']['extension'][$type]->human_name;
                }
 
+               function haveExtension($type,$function='')
                /*
                @function haveExtension
                @syntax haveExtension($type)
+               @author ralfbecker
                @abstract checks if extension is loaded and load it if it isnt
                */
-               function haveExtension($type,$function='')
                {
-                       return ( 
(isset($GLOBALS['phpgw_info']['etemplate']['extension'][$type]) && 
$GLOBALS['phpgw_info']['etemplate']['extension'][$type]) || 
$this->loadExtension($type)) &&
-                                       ($function == '' || 
(isset($GLOBALS['phpgw_info']['etemplate']['extension'][$type]->public_functions[$function])
 && 
$GLOBALS['phpgw_info']['etemplate']['extension'][$type]->public_functions[$function]));
+                       return 
($GLOBALS['phpgw_info']['etemplate']['extension'][$type] || 
$this->loadExtension($type,$ui)) &&
+                               ($function == '' || 
$GLOBALS['phpgw_info']['etemplate']['extension'][$type]->public_functions[$function]);
                }
 
+               function 
extensionPreProcess($type,$name,&$value,&$cell,&$readonlys)
                /*
                @function extensionPreProcess
                @syntax extensionPreProcess(&$cell,&$value,&$readonlys)
@@ -515,8 +535,8 @@
                @param &$value value of the extensions content(-array)
                @param &$readonlys value of the extensions 
readonly-setting(-array)
                @abstract executes the pre_process-function of the extension 
$cell[]type]
+               @author ralfbecker
                */
-               function 
extensionPreProcess($type,$name,&$value,&$cell,&$readonlys)
                {
                        if (!$this->haveExtension($type))
                        {
@@ -526,6 +546,7 @@
                                
$GLOBALS['phpgw_info']['etemplate']['extension_data'][$name],$this);
                }
 
+               function extensionPostProcess($type,$name,&$value,$value_in)
                /*
                @function extensionPostProcess
                @syntax extensionPostProcess(&$cell,&$value)
@@ -533,8 +554,8 @@
                @param $name form-name of this widget/field (used as a unique 
index into extension_data)
                @param &$value value of the extensions content(-array)
                @abstract executes the post_process-function of the extension 
$cell[type]
+               @author ralfbecker
                */
-               function extensionPostProcess($type,$name,&$value,$value_in)
                {
                        if (!$this->haveExtension($type,'post_process'))
                        {
@@ -545,11 +566,13 @@
                                
$GLOBALS['phpgw_info']['etemplate']['loop'],$this,$value_in);
                }
 
+               function extensionRender($type,$name,&$value,&$cell,$readonly)
                /*
+               @function extensionRender
                @syntax extensionRender(&$cell,$form_name,&$value,$readonly)
                @abstract executes the render-function of the extension 
$cell[type]
+               @author ralfbecker
                */
-               function extensionRender($type,$name,&$value,&$cell,$readonly)
                {
                        if (!$this->haveExtension($type,'render'))
                        {
@@ -559,8 +582,12 @@
                                
$GLOBALS['phpgw_info']['etemplate']['extension_data'][$name],$this);
                }
 
-               /**
-                * checks if idx, which may contain ONE subindex is set in array
+               /*!
+               @function isset_array
+               @syntax isset_array( $arr,$idx )
+               @author ralfbecker
+               @abstract checks if idx, which may contain ONE subindex is set 
in array
+               @author ralfbecker
                 */
                function isset_array($arr,$idx)
                {
@@ -571,9 +598,13 @@
                        return isset($arr[$idx]);
                }
 
-               /**
-                * sets $arr[$idx] = $val
-                * This works for non-trival indexes like 'a[b][c]' too: 
$arr['a']['b']['c'] = $val;
+               /*!
+               @function set_array
+               @syntax set_array( &$arr,$idx,$val )
+               @author ralfbecker
+               @abstract sets $arr[$idx] = $val
+               @discussion This works for non-trival indexes like 'a[b][c]' 
too: $arr['a']['b']['c'] = $val;
+               @author ralfbecker
                 */
                function set_array(&$arr,$idx,$val)
                {
@@ -590,11 +621,14 @@
                        $pos = $val;
                }
 
-               /**
-                * return a var-param to $arr[$idx]
-                *
-                * $sub = get_array($arr,'a[b]'); $sub = 'c'; is equivalent to 
$arr['a']['b'] = 'c';
-                * This works for non-trival indexes like 'a[b][c]' too: it 
returns &$arr[a][b][c]
+               /*!
+               @function get_array
+               @syntax get_array( &$arr,$idx )
+               @author ralfbecker
+               @abstract return a var-param to $arr[$idx]
+               @example $sub = get_array($arr,'a[b]'); $sub = 'c'; is 
equivalent to $arr['a']['b'] = 'c';
+               @discussion This works for non-trival indexes like 'a[b][c]' 
too: it returns &$arr[a][b][c]
+               @author ralfbecker
                 */
                function &get_array(&$arr,$idx)
                {
@@ -615,11 +649,14 @@
                        return $pos;
                }
 
-               /**
-                * unsets $arr[$idx]
-                *
-                * unset_array($arr,'a[b]'); is equivalent to 
unset($arr['a']['b']);
-                * This works for non-trival indexes like 'a[b][c]' too
+               /*!
+               @function unset_array
+               @syntax unset_array( &$arr,$idx )
+               @author ralfbecker
+               @abstract unsets $arr[$idx]
+               @example unset_array($arr,'a[b]'); is equivalent to 
unset($arr['a']['b']);
+               @discussion This works for non-trival indexes like 'a[b][c]' too
+               @author ralfbecker
                 */
                function unset_array(&$arr,$idx)
                {
@@ -636,10 +673,12 @@
                        unset($pos[$idx]);
                }
 
-               /**
-                * merges $old and $new, content of $new has precedence over 
$old
-                *
-                * THIS IS NOT THE SAME AS PHP4: array_merge (as it calls 
itself recursive for values which are arrays.
+               /*!
+               @function complete_array_merge
+               @syntax complete_array_merge( $old,$new )
+               @author ralfbecker
+               @abstract merges $old and $new, content of $new has precedence 
over $old
+               @discussion THIS IS NOT THE SAME AS PHP4: array_merge (as it 
calls itself recursive for values which are arrays.
                 */
                function complete_array_merge($old,$new)
                {
@@ -683,9 +722,9 @@
                        return $cname;
                }
 
-               /**
-                * stores the etemplate in the cache in phpgw_info
-               *
+               /*!
+               @function store_in_cache()
+               @abstract stores the etemplate in the cache in phpgw_info
                 */
                function store_in_cache()
                {
@@ -723,12 +762,12 @@
                        return False;
                }
 
-               /**
-                * Reads an eTemplate from the cache or database / filesystem 
(and updates the cache)
-               *
-                * @param as discripted in soetemplate::read
-                * @param $load_via name/array of keys of etemplate to load in 
order to get $name (only as second try!)
-                * @return True if a fitting template is found, else False
+               /*!
+               @function read
+               @abstract Reads an eTemplate from the cache or database / 
filesystem (and updates the cache)
+               @param as discripted in soetemplate::read
+               @param $load_via name/array of keys of etemplate to load in 
order to get $name (only as second try!)
+               @result True if a fitting template is found, else False
                 */
                function 
read($name,$template='default',$lang='default',$group=0,$version='',$load_via='')
                {
@@ -765,11 +804,11 @@
                        return True;
                }
 
-               /**
-                * saves eTemplate-object to db and update the cache
-               *
-                * keys see soetemplate::save
-                * @return the number of affected rows, 1 should be ok, 0 
somethings wrong
+               /*!
+               @function save
+               @abstract saves eTemplate-object to db and update the cache
+               @params keys see soetemplate::save
+               @result the number of affected rows, 1 should be ok, 0 
somethings wrong
                 */
                function 
save($name='',$template='.',$lang='.',$group='',$version='.')
                {

Index: inc/class.date_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- inc/class.date_widget.inc.php       6 Sep 2006 11:13:30 -0000       1.15
+++ inc/class.date_widget.inc.php       10 Feb 2007 16:03:46 -0000      1.16
@@ -1,20 +1,29 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.date_widget.inc.php,v 1.15 2006/09/06 11:13:30 skwashd 
Exp $
-*/
-       /**
-        * widget that reads a date and/or time 
-        *
-        * @param Options/$cell['size'] = $format[,$options], 
-        * @param $format: ''=timestamp or eg. 'Y-m-d H:i' for 2002-12-31 23:59
-        * @param $options: &1 = year is int-input not selectbox, &2 = show a 
[Today] button, \
-        *       * &4 = 1min steps for time (default is 5min, with fallback to 
1min if value is not in 5min-steps)
-        * This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.date_widget.inc.php,v 1.16 2007/02/10 16:03:46 sigurdne Exp $ */
+
+       /*!
+       @class date_widget
+       @author ralfbecker
+       @abstract widget that reads a date and/or time 
+       @param Options/$cell['size'] = $format[,$options], 
+       @param $format: ''=timestamp or eg. 'Y-m-d H:i' for 2002-12-31 23:59
+       @param $options: &1 = year is int-input not selectbox, &2 = show a 
[Today] button, \
+               &4 = 1min steps for time (default is 5min, with fallback to 
1min if value is not in 5min-steps)
+       @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
         */
        class date_widget
        {
@@ -33,7 +42,7 @@
                        $this->timeformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'];
                        if ($ui == 'html')
                        {
-                               $this->jscal = 
createObject('phpgwapi.jscalendar');
+                               $this->jscal = 
CreateObject('phpgwapi.jscalendar');
                        }
                                                                                
                        
                }

Index: inc/class.db_tools.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.db_tools.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.db_tools.inc.php  30 Sep 2006 07:10:52 -0000      1.22
+++ inc/class.db_tools.inc.php  10 Feb 2007 16:03:46 -0000      1.23
@@ -1,12 +1,20 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.db_tools.inc.php,v 1.22 2006/09/30 07:10:52 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.db_tools.inc.php,v 1.23 2007/02/10 16:03:46 sigurdne Exp $ */
+
        class db_tools
        {
                var $public_functions = array
@@ -22,8 +30,7 @@
                var $data;              // Table definitions
                var $app;               // used app
                var $table;             // used table
-               var $types = array
-               (
+               var $types = array(
                        'varchar'       => 'varchar',
                        'int'           => 'int',
                        'auto'          => 'auto',
@@ -37,47 +44,49 @@
                        'timestamp'     => 'timestamp',
 //                     'abstime'   => 'abstime (mysql:timestamp)',
                );
-               var $setup_header = '';
+               var $setup_header = '<?php
+  /**************************************************************************\\
+  * phpGroupWare - Setup                                                     *
+  * http://www.phpgroupware.org                                              *
+  * Created by eTemplates DB-Tools written by address@hidden *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \\**************************************************************************/
 
-               /**
-                * constructor of class
-               *
+  /* $Id: class.db_tools.inc.php,v 1.23 2007/02/10 16:03:46 sigurdne Exp $ */
+';
+
+               /*!
+               @function db_tools
+               @syntax db_tools(  )
+               @author ralfbecker
+               @abstract constructor of class
                 */
                function db_tools()
                {
-                       @set_time_limit(600); //@ to stop issues on safe_mode 
installs
-                       $this->editor = 
createObject('etemplate.etemplate','etemplate.db-tools.edit');
+                       $this->editor = 
CreateObject('etemplate.etemplate','etemplate.db-tools.edit');
                        $this->data = array();
 
                        if (!is_array($GLOBALS['phpgw_info']['apps']) || 
!count($GLOBALS['phpgw_info']['apps']))
                        {
                                
ExecMethod('phpgwapi.applications.read_installed_apps');
                        }
-
-                       //I know this formatting is ugly, but it needs to be 
ugly for now - skwashd
-                       $this->setup_header = '<?php
-/**
-* ' . $this->app . ' Setup
-*
-* @copyright Copyright (C) 2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Your Name <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU Lesser General Public 
License
-* @package etemplate
-* @version $Id: class.db_tools.inc.php,v 1.22 2006/09/30 07:10:52 skwashd Exp $
-*/
-';
-
                }
 
-               /**
-                * this is the table editor (and the callback/submit-method too)
-               *
+               /*!
+               @function edit
+               @syntax edit( $content='',$msg='' )
+               @author ralfbecker
+               @abstract this is the table editor (and the 
callback/submit-method too)
                 */
                function edit($content='',$msg = '')
                {
-                       if (isset($_GET['app']))
+                       if (isset($GLOBALS['HTTP_GET_VARS']['app']))
                        {
-                               $this->app = $_GET['app'];
+                               $this->app = $GLOBALS['HTTP_GET_VARS']['app'];
                        }
                        if (is_array($content))
                        {
@@ -88,7 +97,7 @@
                                $this->app = $content['app'];   // this is what 
the user selected
                                $this->table = $content['table_name'];
                                $posted_app = $content['posted_app'];   // this 
is the old selection
-                               $posted_table = isset($content['posted_table']) 
? $content['posted_table'] : '';
+                               $posted_table = $content['posted_table'];
                        }
                        if ($posted_app && $posted_table &&             // user 
changed app or table
                                 ($posted_app != $this->app || $posted_table != 
$this->table))
@@ -122,7 +131,7 @@
                        {
                                $this->data[$posted_table] = 
$this->content2table($content);
                        }
-                       if ( isset($content['write_tables']) && 
$content['write_tables'] )
+                       if ($content['write_tables'])
                        {
                                if 
($this->needs_save('',$this->app,$this->table,$this->data[$posted_table]))
                                {
@@ -130,7 +139,7 @@
                                }
                                $msg .= lang('Table unchanged, no write 
necessary !!!');
                        }
-                       elseif ( isset($content['delete']) && 
$content['delete'] )
+                       elseif ($content['delete'])
                        {
                                list($col) = each($content['delete']);
 
@@ -140,12 +149,11 @@
                                unset($this->data[$posted_table]['fd'][$key]);
                                $this->changes[$posted_table][$key] = 
'**deleted**';
                        }
-                       elseif ( isset($content['add_column']) && 
$content['add_column'] )
+                       elseif ($content['add_column'])
                        {
                                $this->data[$posted_table]['fd'][''] = array();
                        }
-                       elseif ( (isset($content['add_table']) && 
$content['add_table'])
-                               || (isset($content['import']) && 
$content['import']) )
+                       elseif ($content['add_table'] || $content['import'])
                        {
                                if (!$this->app)
                                {
@@ -163,8 +171,8 @@
                                }
                                else // import
                                {
-                                       $oProc = 
createObject('phpgwapi.schema_proc',$GLOBALS['phpgw_info']['server']['db_type']);
-                                       $oProc->m_odb =& $GLOBALS['phpgw']->db;
+                                       $oProc = 
CreateObject('phpgwapi.schema_proc',$GLOBALS['phpgw_info']['server']['db_type']);
+                                       $oProc->m_odb = $GLOBALS['phpgw']->db;
                                        
$oProc->m_oTranslator->_GetColumns($oProc,$content['new_table_name'],$nul);
 
                                        while (list($key,$tbldata) = each 
($oProc->m_oTranslator->sCol))
@@ -218,18 +226,19 @@
                                array('posted_table' => 
$this->table,'posted_app' => $this->app,'changes' => $this->changes));
                }
 
-               /**
-                * checks if table was changed and if so offers user to save 
changes
-               *
-                * @param $cont the content of the form (if called by 
process_exec)
-                * @param $posted_app the app the table is from
-                * @param $posted_table the table-name
-                * @param $edited_table the edited table-definitions
-                * @return only if no changes
+               /*!
+               @function needs_save
+               @syntax needs_save( 
$cont='',$posted_app='',$posted_table='',$edited_table='' )
+               @author ralfbecker
+               @abstract checks if table was changed and if so offers user to 
save changes
+               @param $cont the content of the form (if called by process_exec)
+               @param $posted_app the app the table is from
+               @param $posted_table the table-name
+               @param $edited_table the edited table-definitions
+               @result only if no changes
                 */
                function 
needs_save($cont='',$posted_app='',$posted_table='',$edited_table='')
                {
-                       $msg = '';
                        if (!$posted_app && is_array($cont))
                        {
                                if (isset($cont['yes']))
@@ -309,11 +318,13 @@
                        return True;    // dont continue in edit
                }
 
-               /**
-                * creates content-array from a $table
-               *
-                * @param $table table-definition, eg. 
$phpgw_baseline[$table_name]
-                * @return content-array
+               /*!
+               @function table2content
+               @syntax table2content( $table )
+               @author ralfbecker
+               @abstract creates content-array from a $table
+               @param $table table-definition, eg. $phpgw_baseline[$table_name]
+               @result content-array
                 */
                function table2content($table)
                {
@@ -324,10 +335,10 @@
                                $col_defs['pk'] = 
in_array($col_name,$table['pk']);
                                $col_defs['uc']  = 
in_array($col_name,$table['uc']);
                                $col_defs['ix'] = 
in_array($col_name,$table['ix']);
-                               $col_defs['fk'] = 
isset($table['fk'][$col_name]) ? $table['fk'][$col_name] : '';
+                               $col_defs['fk'] = $table['fk'][$col_name];
                                if (isset($col_defs['default']) && 
$col_defs['default'] == '')
                                {
-                                       $col_defs['default'] = 
is_int($col_defs['default']) ? '0' : "''";       // special value for empty, 
but set, default
+                                       $col_defs['default'] = 
is_int($col_defs['default']) ? '0' : "''";       // spezial value for empty, 
but set, default
                                }
                                $col_defs['n'] = $n;
 
@@ -340,12 +351,14 @@
                        return $content;
                }
 
-               /**
-                * creates table-definition from posted content
-               *
-                * @param $content posted content-array
-                *  It sets some reasonalbe defaults for not set precisions 
(else setup will not install)
-                * @return table-definition
+               /*!
+               @function content2table
+               @syntax content2table( $content )
+               @author ralfbecker
+               @abstract creates table-definition from posted content
+               @param $content posted content-array
+               @note  It sets some reasonalbe defaults for not set precisions 
(else setup will not install)
+               @result table-definition
                 */
                function content2table($content)
                {
@@ -366,9 +379,8 @@
                        {
                                $col = $content["Row$n"];
 
-                               while ( isset($this->changes[$posted_table]) 
-                                       && (list($old_name,$old_col) = 
@each($old_cols))
-                                       && 
$this->changes[$posted_table][$old_name] == '**deleted**');
+                               while ((list($old_name,$old_col) = 
@each($old_cols)) &&
+                                      $this->changes[$posted_table][$old_name] 
== '**deleted**') ;
 
                                if (($name = $col['name']) != '')               
// ignoring lines without column-name
                                {
@@ -427,12 +439,14 @@
                        return $table;
                }
 
-               /**
-                * includes $app/setup/tables_current.inc.php
-               *
-                * @param $app application name
-                * @param $phpgw_baseline where to put the data
-                * @return True if file found, False else
+               /*!
+               @function read
+               @syntax read( $app,&$phpgw_baseline )
+               @author ralfbecker
+               @abstract includes $app/setup/tables_current.inc.php
+               @param $app application name
+               @param $phpgw_baseline where to put the data
+               @result True if file found, False else
                 */
                function read($app,&$phpgw_baseline)
                {
@@ -458,14 +472,12 @@
 
                function write_array($arr,$depth,$parent='')
                {
-                       $only_vals = false;
-                       $tabs = '';
                        if (in_array($parent,array('pk','fk','ix','uc')))
                        {
                                $depth = 0;
                                if ($parent != 'fk')
                                {
-                                       $only_vals = true;
+                                       $only_vals = True;
                                }
                        }
                        if ($depth)
@@ -512,12 +524,14 @@
                        return $def;
                }
 
-               /**
-                * writes tabledefinitions $phpgw_baseline to file 
/$app/setup/tables_current.inc.php
-               *
-                * @param $app app-name
-                * @param $phpgw_baseline tabledefinitions
-                * @return True if file writen else False
+               /*!
+               @function write
+               @syntax write( $app,$phpgw_baseline )
+               @author ralfbecker
+               @abstract writes tabledefinitions $phpgw_baseline to file 
/$app/setup/tables_current.inc.php
+               @param $app app-name
+               @param $phpgw_baseline tabledefinitions
+               @return True if file writen else False
                 */
                function write($app,$phpgw_baseline)
                {
@@ -565,13 +579,15 @@
                        return True;
                }
 
-               /**
-                * reads and updates the version and tables info in file 
$app/setup/setup.inc.php
-               *
-                * @param $app the app
-                * @param $new new version number to set, if $new != ''
-                * @param $tables new tables to include, if $tables != ''
-                * @return the version or False if the file could not be read 
or written
+               /*!
+               @function setup_version
+               @syntax setup_version( $app,$new = '',$tables='' )
+               @author ralfbecker
+               @abstract reads and updates the version and tables info in file 
$app/setup/setup.inc.php
+               @param $app the app
+               @param $new new version number to set, if $new != ''
+               @param $tables new tables to include, if $tables != ''
+               @return the version or False if the file could not be read or 
written
                 */
                function setup_version($app,$new = '',$tables='')
                {
@@ -672,13 +688,15 @@
                        return $new;
                }
 
-               /**
-                * updates file /$app/setup/tables_update.inc.php to reflect 
changes in $current
-               *
-                * @param $app app-name
-                * @param $current new tabledefinitions
-                * @param $version new version
-                * @return True if file writen else False
+               /*!
+               @function update
+               @syntax update( $app,$current,$version )
+               @author ralfbecker
+               @abstract updates file /$app/setup/tables_update.inc.php to 
reflect changes in $current
+               @param $app app-name
+               @param $current new tabledefinitions
+               @param $version new version
+               @return True if file writen else False
                 */
                function update($app,$current,$version)
                {
@@ -790,8 +808,7 @@
                                                        }
                                                }
                                        }
-                                       if ( isset($this->changes[$name])
-                                               && 
is_array($this->changes[$name]) )
+                                       if (is_array($this->changes[$name]))
                                        {
                                                foreach($this->changes[$name] 
as $col => $new_col)
                                                {
@@ -835,10 +852,12 @@
                        return $update;
                }
 
-               /**
-                * sets all nullable properties to True or False
-               *
-                * @return the new array
+               /*!
+               @function normalize
+               @syntax normalize( $table )
+               @author ralfbecker
+               @abstract sets all nullable properties to True or False
+               @result the new array
                 */
                function normalize($table)
                {
@@ -846,17 +865,15 @@
 
                        foreach($table['fd'] as $col => $props)
                        {
-                               $table['fd'][$col] = array
-                               (
-                                       'type'          => 
strval($props['type']),
-                                       'precision'     => (int) 
(isset($props['precision']) ? $props['precision'] : 0),
-                                       'scale'         => (int) 
(isset($props['scale']) ? $props['scale'] : 0),
-                                       'nullable'      => 
isset($props['nullable']) ? !!$props['nullable'] : false,
-                                       'default'       => strval( 
isset($props['default']) ? $props['default'] : '' )
+                               $table['fd'][$col] = array(
+                                       'type' => ''.$props['type'],
+                                       'precision' => 0+$props['precision'],
+                                       'scale' => 0+$props['scale'],
+                                       'nullable' => !!$props['nullable'],
+                                       'default' => ''.$props['default']
                                );
                        }
-                       return array
-                       (
+                       return array(
                                'fd' => $table['fd'],
                                'pk' => $table['pk'],
                                'fk' => $table['fk'],
@@ -865,10 +882,12 @@
                        );
                }
 
-               /**
-                * compares two table-definitions
-               *
-                * @return True if they are identical or False else
+               /*!
+               @function tables_identical
+               @syntax tables_identical( $old,$new )
+               @author ralfbecker
+               @abstract compares two table-definitions
+               @result True if they are identical or False else
                 */
                function tables_identical($a,$b)
                {

Index: inc/class.editor.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.editor.inc.php    6 Sep 2006 11:13:30 -0000       1.40
+++ inc/class.editor.inc.php    10 Feb 2007 16:03:46 -0000      1.41
@@ -1,12 +1,20 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.editor.inc.php,v 1.40 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker <address@hidden>  *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.editor.inc.php,v 1.41 2007/02/10 16:03:46 sigurdne Exp $ */
+
 
        class editor
        {
@@ -47,8 +55,8 @@
 
                function editor()
                {
-                       $this->etemplate = createObject('etemplate.etemplate');
-                       //echo '$_POST='; _debug_array($_POST);
+                       $this->etemplate = CreateObject('etemplate.etemplate');
+                       //echo '$HTTP_POST_VARS='; 
_debug_array($HTTP_POST_VARS);
 
                        $this->editor = new etemplate('etemplate.editor');
                }
@@ -92,12 +100,15 @@
                        reset($this->options);
                        while (list($n,$opt) = each($this->options))
                        {
-                               $content['options'][$opt] = $this->options[$n];
+                               $content['options'][$opt] = $options[$n];
                        }
                        $cols_spanned = array();
-                       $no_button = array();
+                       reset($this->etemplate->data);
                        if (isset($this->etemplate->data[0]))
                        {
+                               each($this->etemplate->data);
+                       }
+                       $no_button = array();
                        while (list($row,$cols) = each($this->etemplate->data))
                        {
                                if ($this->etemplate->rows <= 1)
@@ -128,14 +139,7 @@
                                        }
                                        else
                                        {
-                                               if(isset($cell['span']))
-                                               {
                                                        $spanned = 
$cell['span'] == 'all' ? $this->etemplate->cols-$c : 0+$cell['span'];
-                                               }
-                                               else
-                                               {
-                                                       $spanned = 0;
-                                               }
                                                
                                                switch($cell['type'])   // load 
a cell-type-specific tpl
                                                {
@@ -161,7 +165,6 @@
                                        }
                                }
                        }
-                       }
                        $no_button['ColA']['exchange_col[1]'] = 
$no_button['Row1']['exchange_row[1]'] = True;
 
                        if ($this->debug)
@@ -523,7 +526,7 @@
                        }
                        if (!is_object($this->etemplate->xul_io))
                        {
-                               $this->etemplate->xul_io = 
createObject('etemplate.xul_io');
+                               $this->etemplate->xul_io = 
CreateObject('etemplate.xul_io');
                        }
                        $xul = 
$this->etemplate->xul_io->export(&$this->etemplate);
 
@@ -544,7 +547,7 @@
 
                        if (!is_object($this->etemplate->xul_io))
                        {
-                               $this->etemplate->xul_io = 
createObject('etemplate.xul_io');
+                               $this->etemplate->xul_io = 
CreateObject('etemplate.xul_io');
                        }
                        $imported = 
$this->etemplate->xul_io->import(&$this->etemplate,$xul);
                        $this->etemplate->modified = @filemtime($f);
@@ -788,11 +791,13 @@
                        ),'');
                }
 
-               /**
-                * search the inc-dirs of etemplate and the app whichs template 
is edited for extensions / custom widgets
-                *
-                * extensions are class-files in 
$app/inc/class.${name}_widget.inc.php
-                * @return array with name => human_name of the extensions found
+               /*!
+               @function scan_for_extensions
+               @syntax scan_for_extensions( $app )
+               @author ralfbecker
+               @abstract search the inc-dirs of etemplate and the app whichs 
template is edited for extensions / custom widgets
+               @discussion extensions are class-files in 
$app/inc/class.${name}_widget.inc.php
+               @result array with name => human_name of the extensions found
                 */
                function scan_for_extensions($app='etemplate')
                {

Index: inc/class.etemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.etemplate.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.etemplate.inc.php 6 Sep 2006 11:13:30 -0000       1.7
+++ inc/class.etemplate.inc.php 10 Feb 2007 16:03:46 -0000      1.8
@@ -1,19 +1,26 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.etemplate.inc.php,v 1.7 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.etemplate.inc.php,v 1.8 2007/02/10 16:03:46 sigurdne Exp $ */
 
        if (!function_exists('get_var'))
        {
                include_once('get_var.php');
        }
        $ui = ''; // html UI, which UI to use, should come from api and be in 
$GLOBALS['phpgw']???
-       if (isset($_ENV['DISPLAY']) && $_ENV['DISPLAY'] && isset($_SERVER['_']))
+       if ($_ENV['DISPLAY'] && isset($_SERVER['_']))
        {
                $ui = '_gtk';
        }

Index: inc/class.html.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.html.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.html.inc.php      6 Sep 2006 14:12:50 -0000       1.26
+++ inc/class.html.inc.php      10 Feb 2007 16:03:46 -0000      1.27
@@ -1,12 +1,19 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.html.inc.php,v 1.26 2006/09/06 14:12:50 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.html.inc.php,v 1.27 2007/02/10 16:03:46 sigurdne Exp $ */
 
 class html
 {
@@ -79,7 +86,6 @@
 
        function input_hidden($vars,$value='',$ignore_empty=True)
        {
-               $html = '';
                if (!is_array($vars))
                {
                        $vars = array( $vars => $value );
@@ -154,29 +160,24 @@
                        ($image == '' || $accesskey ? $lang_u : '').'</button>';
        }
 
-       /**
-        * creates an absolut link + the query / get-variables
-       *
-        * @param $url phpgw-relative link, may include query / get-vars
-        * $vars query or array ('name' => 'value', ...) with query
-        * 
link('/index.php?menuaction=infolog.uiinfolog.get_list',array('info_id' => 123))
-        *  = 
'http://domain/phpgw-path/index.php?menuaction=infolog.uiinfolog.get_list&info_id=123'
-        * @return absolut link already run through $GLOBALS['phpgw']->link
+       /*!
+       @function link
+       @abstract creates an absolut link + the query / get-variables
+       @param $url phpgw-relative link, may include query / get-vars
+       @parm $vars query or array ('name' => 'value', ...) with query
+       @example 
link('/index.php?menuaction=infolog.uiinfolog.get_list',array('info_id' => 123))
+       @example  = 
'http://domain/phpgw-path/index.php?menuaction=infolog.uiinfolog.get_list&info_id=123'
+       @result absolut link already run through $phpgw->link
         */
-       function link($url, $vars='')
+       function link($url,$vars='')
        {
-               //echo "<p>html::link(url='$url',vars='"; print_r($vars); echo 
"')</p>\n" . _debug_array(debug_backtrace());
+               //echo "<p>html::link(url='$url',vars='"; print_r($vars); echo 
"')</p>\n";
                if (!is_array($vars))
                {
-                       parse_str($vars, $vars);
+                       parse_str($vars,$vars);
                }
-               
-               if(strpos('?',$url) > 0)
-               {
                        list($url,$v) = explode('?',$url);      // url may 
contain additional vars
-               }
-               
-               if (isset($v))
+               if ($v)
                {
                        parse_str($v,$v);
                        $vars += $v;
@@ -208,16 +209,17 @@
                        $hidden_vars,$url,$url_vars,$form_name,'',$method);
        }
 
-       /**
-        * creates table from array with rows
-        * abstract the html stuff
-        * @param $rows array with rows, each row is an array of the cols
-        * @param $options options for the table-tag
-        * $rows = array ( '1'  => array( 1 => 'cell1', '.1' => 'colspan=3',
-        *                                2 => 'cell2', 3 => 'cell3', '.3' => 
'width="10%"' ),
-        *                 '.1' => 'BGCOLOR="#0000FF"' );
-        * table($rows,'WIDTH="100%"') = '<table WIDTH="100%"><tr><td 
colspan=3>cell1</td><td>cell2</td><td width="10%">cell3</td></tr></table>'
-        * @return string with html-code of the table
+       /*!
+       @function table
+       @abstracts creates table from array with rows
+       @discussion abstract the html stuff
+       @param $rows array with rows, each row is an array of the cols
+       @param $options options for the table-tag
+       @example $rows = array ( '1'  => array( 1 => 'cell1', '.1' => 
'colspan=3',
+       @example                                2 => 'cell2', 3 => 'cell3', 
'.3' => 'width="10%"' ),
+       @example                 '.1' => 'BGCOLOR="#0000FF"' );
+       @example table($rows,'WIDTH="100%"') = '<table WIDTH="100%"><tr><td 
colspan=3>cell1</td><td>cell2</td><td width="10%">cell3</td></tr></table>'
+       @result string with html-code of the table
         */
        function table($rows,$options = '',$no_table_tr=False)
        {
@@ -229,10 +231,7 @@
                        {
                                continue;                                       
// parameter
                        }
-                       if(isset($rows['.'.$key]))
-                       {
                                $html .= $no_table_tr && $key == 1 ? '' : 
"\t<TR ".$rows['.'.$key].">\n";
-                       }
 
                        foreach($row as $key => $cell)
                        {
@@ -325,19 +324,19 @@
                return "<hr $options>\n";
        }
 
-       /**
-        * formats option-string for most of the above functions
-       *
-        * @param $options String (or Array) with option-values eg. '100%,,1'
-        * @param $names String (or Array) with the option-names eg. 
'WIDTH,HEIGHT,BORDER'
-        * formatOptions('100%,,1','WIDTH,HEIGHT,BORDER') = ' WIDTH="100%" 
BORDER="1"'
-        * @return option string
+       /*!
+       @function formatOptions
+       @abstract formats option-string for most of the above functions
+       @param $options String (or Array) with option-values eg. '100%,,1'
+       @param $names String (or Array) with the option-names eg. 
'WIDTH,HEIGHT,BORDER'
+       @example formatOptions('100%,,1','WIDTH,HEIGHT,BORDER') = ' 
WIDTH="100%" BORDER="1"'
+       @result option string
         */
        function formatOptions($options,$names)
        {
                if (!is_array($options)) $options = explode(',',$options);
                if (!is_array($names))   $names   = explode(',',$names);
-               $html = '';
+
                while (list($n,$val) = each($options))
                        if ($val != '' && $names[$n] != '')
                                $html .= ' '.$names[$n].'="'.$val.'"';
@@ -345,35 +344,27 @@
                return $html;
        }
 
-       /**
-        * returns simple stylesheet (incl. <STYLE> tags) for nextmatch 
row-colors
-       *
-        * @return the classes 'th' = nextmatch header, 'row_on'+'row_off' = 
alternating rows
+       /*!
+       @function themeStyles
+       @abstract returns simple stylesheet (incl. <STYLE> tags) for nextmatch 
row-colors
+       @result the classes 'th' = nextmatch header, 'row_on'+'row_off' = 
alternating rows
         */
        function themeStyles()
        {
                return $this->style($this->theme2css());
        }
 
-       /**
-        * returns simple stylesheet for nextmatch row-colors
-       *
-        * @return the classes 'th' = nextmatch header, 'row_on'+'row_off' = 
alternating rows
+       /*!
+       @function theme2css
+       @abstract returns simple stylesheet for nextmatch row-colors
+       @result the classes 'th' = nextmatch header, 'row_on'+'row_off' = 
alternating rows
         */
        function theme2css()
        {
-               //XXX Temporary fix, Caeies
-               //if(isset($GLOBALS['phpgw_info']['theme']))
-               //{
-               //      return 
-               //              ".th { background: 
".$GLOBALS['phpgw_info']['theme']['th_bg']."; font-weight: bold; }\n".
-               //              ".row_on,.th_bright { background: 
".$GLOBALS['phpgw_info']['theme']['row_on']."; }\n".
-               //              ".row_off { background: 
".$GLOBALS['phpgw_info']['theme']['row_off']."; }\n";
-               //}
-               //else
-               //{
-                       return '';
-               //}
+               return 
+                       ".th { background: 
".$GLOBALS['phpgw_info']['theme']['th_bg']."; font-weight: bold; }\n".
+                       ".row_on,.th_bright { background: 
".$GLOBALS['phpgw_info']['theme']['row_on']."; }\n".
+                       ".row_off { background: 
".$GLOBALS['phpgw_info']['theme']['row_off']."; }\n";
        }
 
        function style($styles)

Index: inc/class.link_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.link_widget.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.link_widget.inc.php       6 Sep 2006 11:13:30 -0000       1.9
+++ inc/class.link_widget.inc.php       10 Feb 2007 16:03:46 -0000      1.10
@@ -1,22 +1,28 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.link_widget.inc.php,v 1.9 2006/09/06 11:13:30 skwashd 
Exp $
-*/
-
-       /**
-        * link-to:   Widget to create links to an other entries of link-aware 
apps
-       *
-        * link-list: Widget to shows the links to an entry and a Unlink Button 
for each link
-       *
-        * link-string: comma-separated list of link-titles with a link to its 
view method, value is like get_links()
-       *
-        * This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no
-        *       * render-function.
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.link_widget.inc.php,v 1.10 2007/02/10 16:03:46 sigurdne Exp $ */
+
+       /*!
+       @class link_widget
+       @author ralfbecker
+       @abstract link-to:   Widget to create links to an other entries of 
link-aware apps
+       @abstract link-list: Widget to shows the links to an entry and a Unlink 
Button for each link
+       @abstract link-string: comma-separated list of link-titles with a link 
to its view method, value is like get_links()
+       @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no
+               render-function.
         */
        class link_widget
        {
@@ -33,7 +39,7 @@
 
                function link_widget($ui)
                {
-                       $this->link = createObject('infolog.bolink');
+                       $this->link = CreateObject('infolog.bolink');
                }
 
                function 
pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)

Index: inc/class.nextmatch_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.nextmatch_widget.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/class.nextmatch_widget.inc.php  8 Feb 2007 14:07:50 -0000       1.16
+++ inc/class.nextmatch_widget.inc.php  10 Feb 2007 16:03:46 -0000      1.17
@@ -1,18 +1,26 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.nextmatch_widget.inc.php,v 1.16 2007/02/08 14:07:50 
sigurdne Exp $
-*/
-
-       /**
-        * Widget that show only a certain number of data-rows and allows to 
modifiy the rows shown (scroll).
-        *
-        * This widget replaces the old nextmatch-class
-        * This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.nextmatch_widget.inc.php,v 1.17 2007/02/10 16:03:46 sigurdne 
Exp $ */
+
+       /*!
+       @class nextmatch_widget
+       @author ralfbecker
+       @abstract Widget that show only a certain number of data-rows and 
allows to modifiy the rows shown (scroll).
+       @discussion This widget replaces the old nextmatch-class
+       @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
         */
        class nextmatch_widget
        {
@@ -31,7 +39,7 @@
                        //echo "<p>nextmatch_widget.pre_process: value = "; 
_debug_array($value);
 
                        list($app,$class,$method) = 
explode('.',$value['get_rows']);
-                       $obj = createObject($app.'.'.$class);
+                       $obj = CreateObject($app.'.'.$class);
                        if (!is_object($obj))
                        {
                                echo "<p>nextmatch_widget::pre_process($name): 
'$value[get_rows]' is no valid method !!!</p>\n";
@@ -61,8 +69,8 @@
                        }
                        $max   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                        if ($total <= $max && $options && $value['search'] == 
'' &&
-                                ((isset($value['no_cat']) && $value['no_cat']) 
|| !$value['cat_id']) &&
-                                ((isset($value['no_filter']) && 
$value['no_filter']) || !$value['filter'] || $value['filter'] == 'none') &&
+                                ($value['no_cat'] || !$value['cat_id']) &&
+                                ($value['no_filter'] || !$value['filter'] || 
$value['filter'] == 'none') &&
                                 ($value['no_filter2'] || !$value['filter2'] || 
$value['filter2'] == 'none'))
                        {                                                       
                                // disable whole nextmatch line if no scrolling 
necessary
                                if ($value['header_left'] || 
$value['header_right'])
@@ -83,15 +91,15 @@
                        {
                                $nextmatch = new 
etemplate('etemplate.nextmatch_widget');
 
-                               if (isset($value['no_cat']) && $value['no_cat'])
+                               if ($value['no_cat'])
                                {
                                        $nextmatch->disable_cells('cat_id');
                                }
-                               if (isset($value['no_filter']) && 
$value['no_filter'])
+                               if ($value['no_filter'])
                                {
                                        $nextmatch->disable_cells('filter');
                                }
-                               if (isset($value['no_filter2']) && 
$value['no_filter2'])
+                               if ($value['no_filter2'])
                                {
                                        $nextmatch->disable_cells('filter2');
                                }

Index: inc/class.sbox2.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.sbox2.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.sbox2.inc.php     6 Sep 2006 11:13:30 -0000       1.8
+++ inc/class.sbox2.inc.php     10 Feb 2007 16:03:46 -0000      1.9
@@ -1,15 +1,26 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @internal based on phpgwapi/sbox2
-* @package etemplate
-* @version $Id: class.sbox2.inc.php,v 1.8 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * Based on class.sbox2.inc.php from the phpGroupWare API              *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.sbox2.inc.php,v 1.9 2007/02/10 16:03:46 sigurdne Exp $ */
 
-       include_once(PHPGW_API_INC . '/class.sbox.inc.php');
+       if(!isset($GLOBALS['phpgw_info']['flags']['included_classes']['sbox']))
+       {
+               include(PHPGW_API_INC . '/class.sbox.inc.php');
+               $GLOBALS['phpgw_info']['flags']['included_classes']['sbox'] = 
True;
+       }
 
        class sbox2 extends sbox
        {
@@ -115,7 +126,7 @@
                {
                        if (!is_object($this->bocal))
                        {
-                               $this->bocal = 
createObject('calendar.bocalendar');
+                               $this->bocal = 
createobject('calendar.bocalendar');
                        }
                        if (!is_array($event) && (int) $event > 0)
                        {
@@ -161,7 +172,7 @@
                        {
                                if (!is_object($this->bocal))
                                {
-                                       $this->bocal = 
createObject('calendar.bocalendar');
+                                       $this->bocal = 
createobject('calendar.bocalendar');
                                }
                                if ($query_name)
                                {
@@ -226,7 +237,7 @@
                        // echo 
"<p>getAddress('$name',$id_name,'$query_name','$title')</p>";
                        if ($id_name || $query_name)
                        {
-                               $contacts = createObject('phpgwapi.contacts');
+                               $contacts = createobject('phpgwapi.contacts');
 
                                if ($query_name)
                                {
@@ -258,7 +269,7 @@
                        if (!is_array($addr))
                        {
                                $home = substr($addr,-1) == 'h';
-                               $contacts = createObject('phpgwapi.contacts');
+                               $contacts = createobject('phpgwapi.contacts');
                                list( $addr ) = $contacts->read_single_entry( 
intval($addr) );
                        }
                        if ($home)
@@ -292,7 +303,7 @@
                        // echo 
"<p>getAddress('$name',$id_name,'$query_name','$title')</p>";
                        if ($id_name || $query_name)
                        {
-                               $contacts = createObject('phpgwapi.contacts');
+                               $contacts = createobject('phpgwapi.contacts');
 
                                if ($query_name)
                                {
@@ -349,7 +360,7 @@
                        }
                        if ($id_name || $query_name)
                        {
-                               $projects = createObject('projects.boprojects');
+                               $projects = createobject('projects.boprojects');
                                if (!is_object($projects))
                                {
                                        return '';
@@ -481,8 +492,8 @@
 
                        if (!is_array($account_data))
                        {
-                               $accounts = 
createObject('phpgwapi.accounts',$id);
-                               $accounts->db =& $GLOBALS['phpgw']->db;
+                               $accounts = 
createobject('phpgwapi.accounts',$id);
+                               $accounts->db = $GLOBALS['phpgw']->db;
                                $accounts->read_repository();
                                $account_data = $accounts->data;
                        }
@@ -505,8 +516,8 @@
                 */
                function 
getAccount($name,$id,$longnames=0,$type='accounts',$multiple=0,$options='')
                {
-                       $accounts = createObject('phpgwapi.accounts');
-                       $accounts->db =& $GLOBALS['phpgw']->db;
+                       $accounts = createobject('phpgwapi.accounts');
+                       $accounts->db = $GLOBALS['phpgw']->db;
                        $accs = $accounts->get_list($type);
 
                        if ($multiple < 0)
@@ -548,7 +559,7 @@
                {
                        if (!is_object($this->cat))
                        {
-                               $this->cat = 
createObject('phpgwapi.categories');
+                               $this->cat = 
CreateObject('phpgwapi.categories');
                        }
                        if ($jscript)
                        {

Index: inc/class.select_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.select_widget.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- inc/class.select_widget.inc.php     8 Feb 2007 14:07:50 -0000       1.10
+++ inc/class.select_widget.inc.php     10 Feb 2007 16:03:46 -0000      1.11
@@ -1,18 +1,26 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.select_widget.inc.php,v 1.10 2007/02/08 14:07:50 
sigurdne Exp $
-*/
-
-       /**
-        * Several select-boxes with predefined phpgw specific content.
-        *
-        * This widget replaces the old sbox class
-        * This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.select_widget.inc.php,v 1.11 2007/02/10 16:03:46 sigurdne Exp $ 
*/
+
+       /*!
+       @class select_widget
+       @author ralfbecker
+       @abstract Several select-boxes with predefined phpgw specific content.
+       @discussion This widget replaces the old sbox class
+       @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
         */
        class select_widget
        {
@@ -372,7 +380,7 @@
 
                function 
pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
                {
-                       @list($rows,$type,$type2,$type3) = 
explode(',',$cell['size']);
+                       list($rows,$type,$type2,$type3) = 
explode(',',$cell['size']);
 
                        switch ($cell['type'])
                        {
@@ -412,7 +420,7 @@
                                case 'select-cat':      // !$type == globals 
cats too
                                        if 
(!is_object($GLOBALS['phpgw']->categories))
                                        {
-                                               $GLOBALS['phpgw']->categories = 
createObject('phpgwapi.categories');
+                                               $GLOBALS['phpgw']->categories = 
CreateObject('phpgwapi.categories');
                                        }
                                        $cats = 
$GLOBALS['phpgw']->categories->return_sorted_array(0,False,'','','',!$type);
 

Index: inc/class.so_sql.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.so_sql.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.so_sql.inc.php    6 Sep 2006 11:35:33 -0000       1.8
+++ inc/class.so_sql.inc.php    10 Feb 2007 16:03:46 -0000      1.9
@@ -1,29 +1,37 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.so_sql.inc.php,v 1.8 2006/09/06 11:35:33 skwashd Exp $
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.so_sql.inc.php,v 1.9 2007/02/10 16:03:46 sigurdne Exp $ */
+
+/*!
address@hidden so_sql
address@hidden ralfbecker
address@hidden generalized SQL Storage Object
address@hidden the class can be used in following ways:
address@hidden 1) by calling the constructor with an app and table-name or
address@hidden 2) by setting the following class-vars in a class derifed from 
this one
address@hidden Of cause can you derife the class and call the constructor with 
params.
address@hidden $table_name need to be set in the derived class to the 
db-table-name
address@hidden $autoinc_id db-col-name of autoincrement id or ''
address@hidden $db_key_cols array of all primary-key-columns in form dbName => 
internalName
address@hidden the save function does NOT touch any other cols in the table!!!
address@hidden $db_data_cols array of all data-cols
address@hidden $debug turns on debug-messages
address@hidden $empty_on_write string to be written to db if a col-value is '', 
eg. "''" or 'NULL' (default)
address@hidden $non_db_cols all cols in data which are not (direct)in the db, 
for data_merge
 */
-
-/**
- * generalized SQL Storage Object
- *
- * the class can be used in following ways:
- * 1) by calling the constructor with an app and table-name or
- * 2) by setting the following class-vars in a class derifed from this one
- * Of cause can you derife the class and call the constructor with params.
- * @param $table_name need to be set in the derived class to the db-table-name
- * @param $autoinc_id db-col-name of autoincrement id or ''
- * @param $db_key_cols array of all primary-key-columns in form dbName => 
internalName
- * the save function does NOT touch any other cols in the table!!!
- * @param $db_data_cols array of all data-cols
- * @param $debug turns on debug-messages
- * @param $empty_on_write string to be written to db if a col-value is '', eg. 
"''" or 'NULL' (default)
- * @param $non_db_cols all cols in data which are not (direct)in the db, for 
data_merge
- */
 class so_sql
 {
        var $public_functions = array(
@@ -39,20 +47,23 @@
        var $db_key_cols = array(),$db_data_cols = array(); // key_cols mean 
primary keys
        var $db_uni_cols = array();
        var $db_cols;   // = $db_key_cols + $db_data_cols
+       var $non_db_cols = array();
        var $data;              // holds the content of all db_cols
        var $debug = 0;
        var $empty_on_write = 'NULL';
        var $non_db_cols = array();
 
-       /**
-        * constructor of the class
-        *
-        * NEED to be called from the constructor of the derived class
-        * @param $app, $table should be set if table-defs to be read from 
<app>/setup/tables_current.inc.php
+       /*!
+       @function so_sql
+       @syntax so_sql( $app='',$table='' )
+       @author ralfbecker
+       @abstract constructor of the class
+       @discussion NEED to be called from the constructor of the derived class
+       @param $app, $table should be set if table-defs to be read from 
<app>/setup/tables_current.inc.php
         */
        function so_sql($app='',$table='')
        {
-               $this->db =& $GLOBALS['phpgw']->db;
+               $this->db = $GLOBALS['phpgw']->db;
                $this->db_cols = $this->db_key_cols + $this->db_data_cols;
 
                if ($app && $table)
@@ -68,11 +79,13 @@
                }
        }
 
-       /**
-        * reads table-definition from <app>/setup/tables_current.inc.php
-        *
-        * Does NOT set a different internal-data-name. If you want this, you 
have to do so
-        * in a derifed class !!!
+       /*!
+       @function setup_table
+       @syntax setup_table( $app,$table )
+       @author ralfbecker
+       @abstract reads table-definition from <app>/setup/tables_current.inc.php
+       @discussion Does NOT set a different internal-data-name. If you want 
this, you have to do so
+       @discussion in a derifed class !!!
         */
        function setup_table($app,$table)
        {
@@ -111,10 +124,12 @@
                }
        }
 
-       /**
-        * merges in new values from the given new data-array
-        *
-        * @param $new array in form col => new_value with values to set
+       /*!
+       @function so_data_merge
+       @syntax so_data_merge( $new )
+       @author ralfbecker
+       @abstract merges in new values from the given new data-array
+       @param $new array in form col => new_value with values to set
         */
        function data_merge($new)
        {
@@ -138,12 +153,12 @@
                }
        }
 
-       /**
-        * changes the data from the db-format to your work-format
-       *
-        * it gets called everytime when data is read from the db
-        * This function needs to be reimplemented in the derived class
-        * @param $data if given works on that array and returns result, else 
works on internal data-array
+       /*!
+       @function db2data
+       @abstract changes the data from the db-format to your work-format
+       @discussion it gets called everytime when data is read from the db
+       @discussion This function needs to be reimplemented in the derived class
+       @param $data if given works on that array and returns result, else 
works on internal data-array
         */
        function db2data($data=0)
        {
@@ -160,12 +175,12 @@
                return $data;
        }
 
-       /**
-        * changes the data from your work-format to the db-format
-       *
-        * It gets called everytime when data gets writen into db or on keys 
for db-searches
-        * this needs to be reimplemented in the derived class
-        * @param $data if given works on that array and returns result, else 
works on internal data-array
+       /*!
+       @function data2db
+       @abstract changes the data from your work-format to the db-format
+       @discussion It gets called everytime when data gets writen into db or 
on keys for db-searches
+       @discussion this needs to be reimplemented in the derived class
+       @param $data if given works on that array and returns result, else 
works on internal data-array
         */
        function data2db($data=0)
        {
@@ -182,11 +197,11 @@
                return $data;
        }
 
-       /**
-        * initializes data with the content of key
-       *
-        * @param $keys array with keys in form internalName => value
-        * @return void
+       /*!
+       @function init
+       @abstract initializes data with the content of key
+       @param $keys array with keys in form internalName => value
+       @result void
         */
        function init($keys=array())
        {
@@ -197,11 +212,11 @@
                $this->data_merge($keys);
        }
 
-       /**
-        * reads row matched by key and puts all cols in the data array
-       *
-        * @param $keys array with keys in form internalName => value, may be a 
scalar value if only one key
-        * @return data array if row could be retrived else False and data = 
array()
+       /*!
+       @function read
+       @abstract reads row matched by key and puts all cols in the data array
+       @param $keys array with keys in form internalName => value, may be a 
scalar value if only one key
+       @result data array if row could be retrived else False and data = 
array()
         */
        function read($keys)
        {
@@ -262,10 +277,11 @@
                return $this->data;
        }
 
-       /**
-        * saves the content of data to the db
-        * @param $keys if given $keys are copied to data before saveing => 
allows a save as
-        * @return 0 on success and errno != 0 else
+       /*!
+       @function save
+       @abstracts saves the content of data to the db
+       @param $keys if given $keys are copied to data before saveing => allows 
a save as
+       @result 0 on success and errno != 0 else
         */
        function save($keys='')
        {
@@ -324,11 +340,11 @@
                return $this->db->errno;
        }
 
-       /**
-        * deletes row representing keys in internal data or the supplied $keys 
if != ''
-       *
-        * @param $keys if not '', array with col => value pairs to 
characterise the rows to delete
-        * @return affected rows, should be 1 if ok, 0 if an error
+       /*!
+       @function delete
+       @abstract deletes row representing keys in internal data or the 
supplied $keys if != ''
+       @param $keys if not '', array with col => value pairs to characterise 
the rows to delete
+       @result affected rows, should be 1 if ok, 0 if an error
         */
        function delete($keys='')
        {
@@ -363,18 +379,18 @@
                return $this->db->affected_rows();
        }
 
-       /**
-        * searches db for rows matching searchcriteria
-       *
-        * '*' and '?' are replaced with sql-wildcards '%' and '_'
-        * @param $criteria array of key and data cols, OR a SQL query (content 
for WHERE), fully quoted (!)
-        * @param $only_keys True returns only keys, False returns all cols
-        * @param $order_by fieldnames + {ASC|DESC} separated by colons ','
-        * @param $extra_cols string to be added to the SELECT, eg. (count(*) 
as num)
-        * @param $wildcard string appended befor and after each criteria
-        * @param $empty False=empty criteria are ignored in query, True=empty 
have to be empty in row
-        * @param $op defaults to 'AND', can be set to 'OR' too, then 
criteria's are OR'ed together
-        * @return array of matching rows (the row is an array of the cols) or 
False
+       /*!
+       @function search
+       @abstract searches db for rows matching searchcriteria
+       @discussion '*' and '?' are replaced with sql-wildcards '%' and '_'
+       @param $criteria array of key and data cols, OR a SQL query (content 
for WHERE), fully quoted (!)
+       @param $only_keys True returns only keys, False returns all cols
+       @param $order_by fieldnames + {ASC|DESC} separated by colons ','
+       @param $extra_cols string to be added to the SELECT, eg. (count(*) as 
num)
+       @param $wildcard string appended befor and after each criteria
+       @param $empty False=empty criteria are ignored in query, True=empty 
have to be empty in row
+       @param $op defaults to 'AND', can be set to 'OR' too, then criteria's 
are OR'ed together
+       @result array of matching rows (the row is an array of the cols) or 
False
         */
        function 
search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND')
        {
@@ -419,11 +435,13 @@
                return $n ? $arr : False;
        }
 
-       /**
-        * Check if values for unique keys are unique
-        *
-        * @param $data data-set to check, defaults to $this->data
-        * @return 0: all keys are unique, 1: first key not unique, 2: ...
+       /*!
+       @function not_unique
+       @syntax not_unique( $data='' )
+       @author ralfbecker
+       @abstract Check if values for unique keys are unique
+       @param $data data-set to check, defaults to $this->data
+       @result 0: all keys are unique, 1: first key not unique, 2: ...
         */
        function not_unique($data='')
        {

Index: inc/class.soetemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.soetemplate.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- inc/class.soetemplate.inc.php       8 Feb 2007 14:07:50 -0000       1.33
+++ inc/class.soetemplate.inc.php       10 Feb 2007 16:03:46 -0000      1.34
@@ -1,29 +1,37 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.soetemplate.inc.php,v 1.33 2007/02/08 14:07:50 sigurdne 
Exp $
-*/
-
-       /**
-        * Storage Objects: Everything to store and retrive the eTemplates.
-        *
-        * eTemplates are stored in the db in table 'phpgw_etemplate' and gets 
distributed
-        * through the file 'etemplates.inc.php' in the setup dir of each app. 
That file gets
-        * automatically imported in the db, whenever you show a eTemplate of 
the app. For
-        * performace reasons the timestamp of the file is stored in the db, so 
'new'
-        * eTemplates need to have a newer file. The distribution-file is 
generated with the
-        * function dump, usually by pressing a button in the editor.
-        * writeLangFile writes an lang-file with all Labels, incorporating an 
existing one.
-        * Beside a name eTemplates use the following keys to find the most 
suitable template
-        * for an user (in order of precedence):
-        *  1) User-/Group-Id (not yet implemented)
-        *  2) preferd languages of the user (templates for all langs have 
$lang='')
-        *  3) selected template: verdilak, ... (the default is called '' in 
the db, not default)
-        *  4) a version-number of the form, eg: '0.9.13.001' (filled up with 0 
same size)
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.soetemplate.inc.php,v 1.34 2007/02/10 16:03:46 sigurdne Exp $ */
+
+       /*!
+       @class soetemplate
+       @author ralfbecker
+       @abstract Storage Objects: Everything to store and retrive the 
eTemplates.
+       @discussion eTemplates are stored in the db in table 'phpgw_etemplate' 
and gets distributed
+       @discussion through the file 'etemplates.inc.php' in the setup dir of 
each app. That file gets
+       @discussion automatically imported in the db, whenever you show a 
eTemplate of the app. For
+       @discussion performace reasons the timestamp of the file is stored in 
the db, so 'new'
+       @discussion eTemplates need to have a newer file. The distribution-file 
is generated with the
+       @discussion function dump, usually by pressing a button in the editor.
+       @discussion writeLangFile writes an lang-file with all Labels, 
incorporating an existing one.
+       @discussion Beside a name eTemplates use the following keys to find the 
most suitable template
+       @discussion for an user (in order of precedence):
+       @discussion  1) User-/Group-Id (not yet implemented)
+       @discussion  2) preferd languages of the user (templates for all langs 
have $lang='')
+       @discussion  3) selected template: verdilak, ... (the default is called 
'' in the db, not default)
+       @discussion  4) a version-number of the form, eg: '0.9.13.001' (filled 
up with 0 same size)
         */
        class soetemplate
        {
@@ -63,14 +71,15 @@
                );
                var $db_cols;
 
-               /**
-                * constructor of the class
-               *
-                * @param as read
+               /*!
+               @function soetemplate
+               @abstract constructor of the class
+               @syntax 
soetemplate($name='',$template='',$lang='',$group=0,$version='',$rows=2,$cols=2)
+               @param as read
                 */
                function 
soetemplate($name='',$template='',$lang='',$group=0,$version='',$rows=2,$cols=2)
                {
-                       $this->db =& $GLOBALS['phpgw']->db;
+                       $this->db = $GLOBALS['phpgw']->db;
                        $this->db_cols = $this->db_key_cols + 
$this->db_data_cols;
 
                        if (empty($name))
@@ -83,29 +92,31 @@
                        }
                }
 
-               /**
-                * generates column-names from index: 'A', 'B', ..., 'AA', 
'AB', ..., 'ZZ' (not more!)
-               *
-                * @param $num index to generate name from 1 => 'A'
-                * @return the name
+               /*!
+               @function num2chrs
+               @abstract generates column-names from index: 'A', 'B', ..., 
'AA', 'AB', ..., 'ZZ' (not more!)
+               @syntax num2chrs($num)
+               @param $num index to generate name from 1 => 'A'
+               @result the name
                 */
                function num2chrs($num)
                {
-                       $chrs = '';
                        $min = ord('A');
                        $max = ord('Z') - $min + 1;
                        if ($num >= $max)
                        {
-                               $chrs .= chr(($num / $max) + $min - 1);
+                               $chrs = chr(($num / $max) + $min - 1);
                        }
                        $chrs .= chr(($num % $max) + $min);
 
                        return $chrs;
                }
 
-               /**
-                * constructor for a new / empty cell (nothing fancy so far)
-                * @return the cell
+               /*!
+               @function empty_cell
+               @abstracts constructor for a new / empty cell (nothing fancy so 
far)
+               @syntax empty_cell()
+               @result the cell
                 */
                function empty_cell($type='label',$name='')
                {
@@ -115,15 +126,16 @@
                        );
                }
 
-               /**
-                * constructs a new cell in a give row or the last row, not 
existing rows will be created
-               *
-                * @param int $row row-number starting with 1 (!)
-                * @param string $type type of the cell
-                * @param string $label label for the cell
-                * @param string $name name of the cell (index in the 
content-array)
-                * @param array $attributes other attributes for the cell
-                * @return a reference to the new cell, use $new_cell = 
&$tpl->new_cell(); (!)
+               /*!
+               @function new_cell
+               @abstract constructs a new cell in a give row or the last row, 
not existing rows will be created
+               @syntax new_cell( $row=False )
+               @param int $row row-number starting with 1 (!)
+               @param string $type type of the cell
+               @param string $label label for the cell
+               @param string $name name of the cell (index in the 
content-array)
+               @param array $attributes other attributes for the cell
+               @returns a reference to the new cell, use $new_cell = 
&$tpl->new_cell(); (!)
                 */
                function 
&new_cell($row=False,$type='label',$label='',$name='',$attributes=False)
                {
@@ -160,9 +172,10 @@
                        return $cell;
                }
 
-               /**
-                * initialises rows & cols from the size of the data-array
-               *
+               /*!
+               @function set_rows_cols()
+               @abstract initialises rows & cols from the size of the 
data-array
+               @syntax set_rows_cols()
                 */
                function set_rows_cols()
                {
@@ -170,32 +183,20 @@
                        $this->cols = count($this->data[1]); // 1 = first row, 
not 0
                }
 
-               /**
-                * initialises all internal data-structures of the eTemplate 
and sets the keys
-               *
-                * @param $name name of the eTemplate or array with the keys or 
all data
-                * @param $template,$lang,$group,$version see class
-                * @param $rows,$cols initial size of the template
+               /*!
+               @function init
+               @abstract initialises all internal data-structures of the 
eTemplate and sets the keys
+               @syntax 
init($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
+               @param $name name of the eTemplate or array with the keys or 
all data
+               @param $template,$lang,$group,$version see class
+               @param $rows,$cols initial size of the template
                 */
                function 
init($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
                {
                        reset($this->db_cols);
                        while (list($db_col,$col) = each($this->db_cols))
                        {
-                               if(is_array($name))
-                               {
-                                       if(isset($name[$col]))
-                                       {
-                                               $this->$col = $name[$col];
-                                       }
-                               }
-                               else
-                               {
-                                       if(isset($$col))
-                                       {
-                                               $this->$col = $$col;
-                                       }
-                               }
+                               $this->$col = is_array($name) ? $name[$col] : 
$$col;
                        }
                        if ($this->template == 'default')
                        {
@@ -205,7 +206,7 @@
                        {
                                $this->lang = '';
                        }
-                       $this->tpls_in_file = is_array($name) && 
isset($name['tpls_in_file']) ? $name['tpls_in_file'] : 0;
+                       $this->tpls_in_file = is_array($name) ? 
$name['tpls_in_file'] : 0;
 
                        if (is_array($name) && isset($name['data']))
                        {
@@ -225,14 +226,15 @@
                        }
                }
 
-               /**
-                * Reads an eTemplate from the database
-               *
-                * @param as discripted with the class, with the following 
exeptions
-                * @param $template as '' loads the prefered template 'default' 
loads the default one '' in the db
-                * @param $lang as '' loads the pref. lang 'default' loads the 
default one '' in the db
-                * @param $group is NOT used / implemented yet
-                * @return True if a fitting template is found, else False
+               /*!
+               @function read
+               @abstract Reads an eTemplate from the database
+               @syntax 
read($name,$template='default',$lang='default',$group=0,$version='')
+               @param as discripted with the class, with the following 
exeptions
+               @param $template as '' loads the prefered template 'default' 
loads the default one '' in the db
+               @param $lang as '' loads the pref. lang 'default' loads the 
default one '' in the db
+               @param $group is NOT used / implemented yet
+               @result True if a fitting template is found, else False
                 */
                function 
read($name,$template='default',$lang='default',$group=0,$version='')
                {
@@ -241,7 +243,7 @@
                        {
                                echo 
"<p>soetemplate::read('$this->name','$this->template','$this->lang',$this->group,'$this->version')</p>\n";
                        }
-                       if 
(isset($GLOBALS['phpgw_info']['server']['eTemplate-source']) && 
($GLOBALS['phpgw_info']['server']['eTemplate-source'] == 'files' ||
+                       if 
(($GLOBALS['phpgw_info']['server']['eTemplate-source'] == 'files' ||
                                 
$GLOBALS['phpgw_info']['server']['eTemplate-source'] == 'xslt') && 
$this->readfile())
                        {
                                return True;
@@ -300,10 +302,11 @@
                        return True;
                }
 
-               /**
-                * Reads an eTemplate from the filesystem, the keys are already 
set by init in read
-               *
-                * @return True if a template is found, else False
+               /*!
+               @function readfile
+               @abstract Reads an eTemplate from the filesystem, the keys are 
already set by init in read
+               @syntax readfile()
+               @result True if a template is found, else False
                 */
                function readfile()
                {
@@ -360,7 +363,7 @@
                        {
                                if (!is_object($this->xul_io))
                                {
-                                       $this->xul_io = 
createObject('etemplate.xul_io');
+                                       $this->xul_io = 
CreateObject('etemplate.xul_io');
                                }
                                $loaded = $this->xul_io->import(&$this,$xml);
 
@@ -375,14 +378,16 @@
                        return True;
                }
 
-               /**
-                * Lists the eTemplates matching the given criteria
-                *
-                * @param as discripted with the class, with the following 
exeptions
-                * @param $template as '' loads the prefered template 'default' 
loads the default one '' in the db
-                * @param $lang as '' loads the pref. lang 'default' loads the 
default one '' in the db
-                * @param $group is NOT used / implemented yet
-                * @return array of arrays with the template-params
+               /*!
+               @function search
+               @syntax 
search($name,$template='default',$lang='default',$group=0,$version='')
+               @author ralfbecker
+               @abstract Lists the eTemplates matching the given criteria
+               @param as discripted with the class, with the following 
exeptions
+               @param $template as '' loads the prefered template 'default' 
loads the default one '' in the db
+               @param $lang as '' loads the pref. lang 'default' loads the 
default one '' in the db
+               @param $group is NOT used / implemented yet
+               @result array of arrays with the template-params
                 */
                function 
search($name,$template='default',$lang='default',$group=0,$version='')
                {
@@ -438,9 +443,10 @@
                        return $result;
                }
 
-               /**
-                * copies all cols into the obj and unserializes the data-array
-               *
+               /*!
+               @function db2obj
+               @abstract copies all cols into the obj and unserializes the 
data-array
+               @syntax db2obj()
                 */
                function db2obj()
                {
@@ -463,7 +469,7 @@
                                                        
$this->data[$row][$col]['type'] = $cell['type'][0];
                                                        //echo "corrected in 
$this->name cell $col$row attribute type<br>\n";
                                                }
-                                               if (isset($cell['align']) && 
is_array($cell['align']))
+                                               if (is_array($cell['align']))
                                                {
                                                        
$this->data[$row][$col]['align'] = $cell['align'][0];
                                                        //echo "corrected in 
$this->name cell $col$row attribute align<br>\n";
@@ -474,13 +480,15 @@
                        $this->set_rows_cols();
                }
 
-               /**
-                * to save space in the db all empty values in the array got 
unset
-                *
-                * The never-'' type field ensures a cell does not disapear 
completely.
-                * Calls it self recursivly for arrays / the rows
-                * @param $arr the array to compress
-                * @return the compressed array
+               /*!
+               @function compress_array
+               @syntax compress_array( $arr )
+               @author ralfbecker
+               @abstract to save space in the db all empty values in the array 
got unset
+               @discussion The never-'' type field ensures a cell does not 
disapear completely.
+               @discussion Calls it self recursivly for arrays / the rows
+               @param $arr the array to compress
+               @result the compressed array
                 */
                function compress_array($arr)
                {
@@ -502,11 +510,12 @@
                        return $arr;
                }
 
-               /**
-                * returns obj-data as array
-               *
-                * @param $data_too 0 = no data array, 1 = data array too, 2 = 
serialize data array
-                * @return the array
+               /*!
+               @function as_array
+               @abstract returns obj-data as array
+               @syntax as_array($data_too=0)
+               @param $data_too 0 = no data array, 1 = data array too, 2 = 
serialize data array
+               @result the array
                 */
                function as_array($data_too=0)
                {
@@ -514,7 +523,7 @@
                        reset($this->db_cols);
                        while (list($db_col,$col) = each($this->db_cols))
                        {
-                               if (isset($this->$col) && ($col != 'data' || 
$data_too) )
+                               if ($col != 'data' || $data_too)
                                {
                                        $arr[$col] = $this->$col;
                                }
@@ -529,11 +538,12 @@
                        return $arr;
                }
 
-               /**
-                * saves eTemplate-object to db, can be used as saveAs by 
giving keys as params
-               *
-                * keys see class
-                * @return the number of affected rows, 1 should be ok, 0 
somethings wrong
+               /*!
+               @function save
+               @abstract saves eTemplate-object to db, can be used as saveAs 
by giving keys as params
+               @syntax 
save($name='',$template='.',$lang='.',$group='',$version='.')
+               @params keys see class
+               @result the number of affected rows, 1 should be ok, 0 
somethings wrong
                 */
                function 
save($name='',$template='.',$lang='.',$group='',$version='.')
                {
@@ -615,10 +625,11 @@
                        return $this->db->affected_rows();
                }
 
-               /**
-                * Deletes the eTemplate from the db, object itself is unchanged
-               *
-                * @return the number of affected rows, 1 should be ok, 0 
somethings wrong
+               /*!
+               @function delete
+               @abstract Deletes the eTemplate from the db, object itself is 
unchanged
+               @syntax delete()
+               @result the number of affected rows, 1 should be ok, 0 
somethings wrong
                 */
                function delete()
                {
@@ -631,11 +642,12 @@
                        return $this->db->affected_rows();
                }
 
-               /**
-                * dumps all eTemplates to <app>/setup/etemplates.inc.php for 
distribution
-               *
-                * @param $app app- or template-name
-                * @return the number of templates dumped as message
+               /*!
+               @function dump2setup
+               @abstract dumps all eTemplates to 
<app>/setup/etemplates.inc.php for distribution
+               @syntax dump2setup($app)
+               @param $app app- or template-name
+               @result the number of templates dumped as message
                 */
                function dump2setup($app)
                {
@@ -707,11 +719,12 @@
                        }
                }
 
-               /**
-                * extracts all texts: labels and helptexts from an 
eTemplate-object
-               *
-                * some extensions use a '|' to squezze multiple texts in a 
label or help field
-                * @return array with messages as key AND value
+               /*!
+               @function getToTranslate
+               @abstract extracts all texts: labels and helptexts from an 
eTemplate-object
+               @discussion some extensions use a '|' to squezze multiple texts 
in a label or help field
+               @syntax getToTranslate()
+               @result array with messages as key AND value
                 */
                function getToTranslate()
                {
@@ -736,11 +749,12 @@
                        return $to_trans;
                }
 
-               /**
-                * Read all eTemplates of an app an extracts the texts to an 
array
-               *
-                * @param $app name of the app
-                * @return the array with texts
+               /*!
+               @function getToTranslateApp
+               @abstract Read all eTemplates of an app an extracts the texts 
to an array
+               @syntax getToTranslateApp($app)
+               @param $app name of the app
+               @result the array with texts
                 */
                function getToTranslateApp($app)
                {
@@ -764,14 +778,15 @@
                        return $to_trans;
                }
 
-               /**
-                * Write new lang-file using the existing one and all text from 
the eTemplates
-               *
-                * @param $app app- or template-name
-                * @param $lang language the messages in the template are, 
defaults to 'en'
-                * @param $additional extra texts to translate, if you pass 
here an array with all messages and
-                * @param             select-options they get writen too (form 
is <unique key> => <message>)
-                * @return message with number of messages written (total and 
new)
+               /*!
+               @function writeLangFile
+               @abstract Write new lang-file using the existing one and all 
text from the eTemplates
+               @syntax writeLangFile($app,$lang='en',$additional='')
+               @param $app app- or template-name
+               @param $lang language the messages in the template are, 
defaults to 'en'
+               @param $additional extra texts to translate, if you pass here 
an array with all messages and
+               @param             select-options they get writen too (form is 
<unique key> => <message>)
+               @result message with number of messages written (total and new)
                 */
                function writeLangFile($app,$lang='en',$additional='')
                {
@@ -783,11 +798,11 @@
 
                        if 
(!file_exists(PHPGW_SERVER_ROOT.'/developer_tools/inc/class.solangfile.inc.php'))
                        {
-                               $solangfile = 
createObject('etemplate.solangfile');
+                               $solangfile = 
CreateObject('etemplate.solangfile');
                        }
                        else
                        {
-                               $solangfile = 
createObject('developer_tools.solangfile');
+                               $solangfile = 
CreateObject('developer_tools.solangfile');
                        }
                        $langarr = $solangfile->load_app($app,$lang);
                        if (!is_array($langarr))
@@ -846,11 +861,12 @@
                        return lang("%1 (%2 new) Messages writen for 
Application '%3' and Languages '%4'",$n,$new,$app,$lang);
                }
 
-               /**
-                * Imports the dump-file /$app/setup/etempplates.inc.php 
unconditional (!)
-               *
-                * @param $app app name
-                * @return message with number of templates imported
+               /*!
+               @function import_dump
+               @abstract Imports the dump-file /$app/setup/etempplates.inc.php 
unconditional (!)
+               @syntax import_dump($app)
+               @param $app app name
+               @result message with number of templates imported
                 */
                function import_dump($app)
                {
@@ -873,25 +889,26 @@
                        return lang("%1 new eTemplates imported for Application 
'%2'",$n,$app);
                }
 
-               /**
-                * test if new template-import necessary for app and does the 
import
-               *
-                * Get called on every read of a eTemplate, caches the result 
in phpgw_info.
-                * The timestamp of the last import for app gets written into 
the db.
-                * @param $app app- or template-name
+               /*!
+               @function test_import
+               @abstract test if new template-import necessary for app and 
does the import
+               @discussion Get called on every read of a eTemplate, caches the 
result in phpgw_info.
+               @discussion The timestamp of the last import for app gets 
written into the db.
+               @syntax test_import($app)
+               @param $app app- or template-name
                 */
                function test_import($app)      // should be done from the 
setup-App
                {
                        list($app) = explode('.',$app);
 
-                       if (!$app || 
(isset($GLOBALS['phpgw_info']['etemplate']['import_tested']) && 
isset($GLOBALS['phpgw_info']['etemplate']['import_tested'][$app]) && 
$GLOBALS['phpgw_info']['etemplate']['import_tested'][$app]) )
+                       if (!$app || 
$GLOBALS['phpgw_info']['etemplate']['import_tested'][$app])
                        {
                                return '';      // ensure test is done only 
once per call and app
                        }
                        
$GLOBALS['phpgw_info']['etemplate']['import_tested'][$app] = True;      // need 
to be done before new ...
 
                        $path = 
PHPGW_SERVER_ROOT."/$app/setup/etemplates.inc.php";
-                       $ret = false;
+
                        if ($time = @filemtime($path))
                        {
                                $templ = new soetemplate(".$app",'','##');

Index: inc/class.solangfile.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.solangfile.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.solangfile.inc.php        6 Sep 2006 11:13:30 -0000       1.3
+++ inc/class.solangfile.inc.php        10 Feb 2007 16:03:46 -0000      1.4
@@ -1,11 +1,18 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.solangfile.inc.php,v 1.3 2006/09/06 11:13:30 skwashd Exp 
$
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.solangfile.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $ */
+
        class solangfile
        {
                var $total;
@@ -33,7 +40,7 @@
 
                function solangfile()
                {
-                       $this->db =& $GLOBALS['phpgw']->db;
+                       $this->db = $GLOBALS['phpgw']->db;
                }
 
                function parse_php_app($fd,$plist)
@@ -122,10 +129,10 @@
                        return($plist);
                }
 
-               /**
-                * loads all app phrases into langarray
-               *
-                * @param $lang user lang variable (defaults to en)
+               /*!
+               @function add_app
+               @abstract loads all app phrases into langarray
+               @param $lang    user lang variable (defaults to en)
                 */
                function add_app($app,$userlang='en')
                {
@@ -173,10 +180,10 @@
                        return $this->langarray;
                }
 
-               /**
-                * loads all app phrases into langarray
-               *
-                * @param $lang user lang variable (defaults to en)
+               /*!
+               @function load_app
+               @abstract loads all app phrases into langarray
+               @param $lang user lang variable (defaults to en)
                 */
                function load_app($app,$userlang='en')
                {

Index: inc/class.tab_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.tab_widget.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.tab_widget.inc.php        6 Sep 2006 11:13:30 -0000       1.14
+++ inc/class.tab_widget.inc.php        10 Feb 2007 16:03:46 -0000      1.15
@@ -1,17 +1,26 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.tab_widget.inc.php,v 1.14 2006/09/06 11:13:30 skwashd 
Exp $
-*/
-       /**
-        * widget that shows one row of tabs and an other row with the 
eTemplate of the selected tab
-        *
-        * see the example in 'etemplate.tab_widget.test' (use show to view it)
-        * This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.tab_widget.inc.php,v 1.15 2007/02/10 16:03:46 sigurdne Exp $ */
+
+       /*!
+       @class tab_widget
+       @author ralfbecker
+       @abstract widget that shows one row of tabs and an other row with the 
eTemplate of the selected tab
+       @discussion see the example in 'etemplate.tab_widget.test' (use show to 
view it)
+       @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
         */
        class tab_widget
        {

Index: inc/class.uietemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- inc/class.uietemplate.inc.php       8 Feb 2007 14:07:50 -0000       1.74
+++ inc/class.uietemplate.inc.php       10 Feb 2007 16:03:46 -0000      1.75
@@ -1,26 +1,35 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.uietemplate.inc.php,v 1.74 2007/02/08 14:07:50 sigurdne 
Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.uietemplate.inc.php,v 1.75 2007/02/10 16:03:46 sigurdne Exp $ */
+
        include_once(PHPGW_INCLUDE_ROOT . 
'/etemplate/inc/class.boetemplate.inc.php');
 
-       /**
-        * creates dialogs / HTML-forms from eTemplate descriptions
-        *
-        * etemplate or uietemplate extends boetemplate, all vars and public 
functions are inherited
-        * $tmpl = createObject('etemplate.etemplate','app.template.name');
-        * $tmpl->exec('app.class.callback',$content_to_show);
-        * This creates a form from the eTemplate 'app.template.name' and takes 
care that
-        * the method / public function 'callback' in (bo)class 'class' of 
'app' gets called
-        * if the user submitts the form. Vor the complete param's see the 
description of exec.
-        * @param $debug enables debug messages: 0=no, 1=calls to show and 
process_show, 2=content of process_show
-        * @param                                3=calls to show_cell OR 
template- or cell-type name
-        * @param $html instances of html class used to generate the html
+       /*!
+       @class etemplate
+       @author ralfbecker
+       @abstract creates dialogs / HTML-forms from eTemplate descriptions
+       @discussion etemplate or uietemplate extends boetemplate, all vars and 
public functions are inherited
+       @example $tmpl = 
CreateObject('etemplate.etemplate','app.template.name');
+       @example $tmpl->exec('app.class.callback',$content_to_show);
+       @example This creates a form from the eTemplate 'app.template.name' and 
takes care that
+       @example the method / public function 'callback' in (bo)class 'class' 
of 'app' gets called
+       @example if the user submitts the form. Vor the complete param's see 
the description of exec.
+       @param $debug enables debug messages: 0=no, 1=calls to show and 
process_show, 2=content of process_show
+       @param                                3=calls to show_cell OR template- 
or cell-type name
+       @param $html instances of html class used to generate the html
         */
        class etemplate extends boetemplate
        {
@@ -29,11 +38,11 @@
                var $html;      // instance of html-class
                var $class_conf = array('nmh' => 'th','nmr0' => 'row_on','nmr1' 
=> 'row_off');
 
-               /**
-                * constructor of etemplate class, reads an eTemplate if $name 
is given
-               *
-                * @param $name     name of etemplate or array with name and 
other keys
-                * @param $load_via name/array with keys of other etemplate to 
load in order to get $name
+               /*!
+               @function etemplate
+               @abstract constructor of etemplate class, reads an eTemplate if 
$name is given
+               @param $name     name of etemplate or array with name and other 
keys
+               @param $load_via name/array with keys of other etemplate to 
load in order to get $name
                 */
                function etemplate($name='',$load_via='')
                {
@@ -43,46 +52,47 @@
                                'show'                  => True,
                                'process_show'  => True,
                        );
-                       $this->html = createObject('etemplate.html');   // 
should  be in the api (older version in infolog)
+                       $this->html = CreateObject('etemplate.html');   // 
should  be in the api (older version in infolog)
 
                        $this->boetemplate($name,$load_via);
 
-                       $this->stable = true;
-                       //$this->stable = $a <= 0 && $b <= 9 && $c <= 16 && 
!is_object($GLOBALS['phpgw']->xslttpl);
+                       list($a,$b,$c,$d) = 
explode('.',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+                       //echo "Version: $a.$b.$c.$d\n";
+                       $this->stable = true;//$a <= 0 && $b <= 9 && $c <= 16 
&& !is_object($GLOBALS['phpgw']->xslttpl);
                }
 
-               /**
-                * Abstracts a html-location-header call
-               *
-                * In other UI's than html this needs to call the methode, 
defined by menuaction or
-                * open a browser-window for any other links.
+               /*!
+               @function location
+               @abstract Abstracts a html-location-header call
+               @discussion In other UI's than html this needs to call the 
methode, defined by menuaction or
+               @discussion open a browser-window for any other links.
                 */
                function location($vars='')
                {
                        $GLOBALS['phpgw']->redirect_link(is_array($vars) ? 
'/index.php' : $vars,
-                               is_array($vars) ? $vars : array(), true);
+                               is_array($vars) ? $vars : '');
                }
 
-               /**
-                * Generats a Dialog from an eTemplate - abstract the UI-layer
-               *
-                * This is the only function an application should use, all 
other are INTERNAL and
-                * do NOT abstract the UI-layer, because they return HTML.
-                * Generates a webpage with a form from the template and puts 
process_exec in the
-                * form as submit-url to call process_show for the template 
before it
-                * ExecuteMethod's the given $method of the caller.
-                * @param $method Methode (e.g. 'etemplate.editor.edit') to be 
called if form is submitted
-                * @param $content Array with content to fill the input-fields 
of template, eg. the text-field
-                * @param          with name 'name' gets its content from 
$content['name']
-                * @param $sel_options Array or arrays with the options for 
each select-field, keys are the
-                * @param              field-names, eg. array('name' => array(1 
=> 'one',2 => 'two')) set the
-                * @param              options for field 'name'. 
($content['options-name'] is possible too !!!)
-                * @param $readonlys Array with field-names as keys for fields 
with should be readonly
-                * @param            (eg. to implement ACL grants on 
field-level or to remove buttons not applicable)
-                * @param $preserv Array with vars which should be transported 
to the $method-call (eg. an id) array('id' => $id)
-                *      sets $_POST['id'] for the $method-call
-                * @param $return_html if true, dont show the page, just return 
the html
-                * @return nothing
+               /*!
+               @function exec
+               @abstract Generats a Dialog from an eTemplate - abstract the 
UI-layer
+               @discussion This is the only function an application should 
use, all other are INTERNAL and
+               @discussion do NOT abstract the UI-layer, because they return 
HTML.
+               @discussion Generates a webpage with a form from the template 
and puts process_exec in the
+               @discussion form as submit-url to call process_show for the 
template before it
+               @discussion ExecuteMethod's the given $method of the caller.
+               @param $method Methode (e.g. 'etemplate.editor.edit') to be 
called if form is submitted
+               @param $content Array with content to fill the input-fields of 
template, eg. the text-field
+               @param          with name 'name' gets its content from 
$content['name']
+               @param $sel_options Array or arrays with the options for each 
select-field, keys are the
+               @param              field-names, eg. array('name' => array(1 => 
'one',2 => 'two')) set the
+               @param              options for field 'name'. 
($content['options-name'] is possible too !!!)
+               @param $readonlys Array with field-names as keys for fields 
with should be readonly
+               @param            (eg. to implement ACL grants on field-level 
or to remove buttons not applicable)
+               @param $preserv Array with vars which should be transported to 
the $method-call (eg. an id) array('id' => $id)
+                       sets $_POST['id'] for the $method-call
+               @param $return_html if true, dont show the page, just return 
the html
+               @result nothing
                 */
                function 
exec($method,$content,$sel_options='',$readonlys='',$preserv='',$changes='',$return_html=False)
                {
@@ -119,14 +129,14 @@
                                $this->html->form($this->include_java_script(1).
                                        
$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),array(
                                                'etemplate_exec_id' => $id
-                                       ),'/etemplate/process_exec.php', 
array('menuaction' => $method),'eTemplate', 
$GLOBALS['phpgw_info']['etemplate']['form_options']);
+                                       
),'/etemplate/process_exec.php?menuaction='.$method,'','eTemplate',$GLOBALS['phpgw_info']['etemplate']['form_options']);
                        
//_debug_array($GLOBALS['phpgw_info']['etemplate']['to_process']);
                        if ($this->stable)
                        {
                                $hooked = 
$GLOBALS['phpgw']->template->get_var('phpgw_body');
                                if 
(address@hidden'phpgw_info']['etemplate']['hooked'] && !$return_html)
                                {
-                                       
$GLOBALS['phpgw_info']['flags']['java_script'] = 
isset($GLOBALS['phpgw_info']['flags']['java_script']) ? 
$GLOBALS['phpgw_info']['flags']['java_script'] : '' . 
$this->include_java_script(2);
+                                       
$GLOBALS['phpgw_info']['flags']['java_script'] .= $this->include_java_script(2);
                                        
$GLOBALS['phpgw']->common->phpgw_header();
                                }
                                else
@@ -140,28 +150,24 @@
                                $hooked = $hooked['body_data'];
                                
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('java_script' => 
$GLOBALS['phpgw_info']['flags']['java_script'].$this->include_java_script(2)));
                        }
-
-                       $tmpa = explode(',',$this->size);
-                       $width = isset($tmpa[0]) ? $tmpa[0] : '';
-                       $height = isset($tmpa[1]) ? $tmpa[1] : '';
-                       $overflow = isset($tmpa[6]) ? $tmpa[6] : '';
-                       unset($tmpa);
+                       /* is in show now for every template
+                       list($width,$height,,,,,$overflow) = 
explode(',',$this->size);
                        if ($overflow)
                        {
                                $html = 
$this->html->div($html,'STYLE="'.($width?"width: $width; 
":'').($height?"height: $height; ":'')."overflow: $overflow;\"");
                        }
+                       */
                        $id = $this->save_appsession($this->as_array(1) + array(
                                'readonlys' => $readonlys,
                                'content' => $content,
                                'changes' => $changes,
                                'sel_options' => $sel_options,
                                'preserv' => $preserv,
-                               'extension_data' => 
isset($GLOBALS['phpgw_info']['etemplate']['extension_data']) ? 
$GLOBALS['phpgw_info']['etemplate']['extension_data'] : '',
-                               'to_process' => 
isset($GLOBALS['phpgw_info']['etemplate']['to_process']) ? 
$GLOBALS['phpgw_info']['etemplate']['to_process'] : '',
-                               'java_script' => 
isset($GLOBALS['phpgw_info']['etemplate']['java_script']) ? 
$GLOBALS['phpgw_info']['etemplate']['java_script'] : '',
-                               'dom_enabled' => 
isset($GLOBALS['phpgw_info']['etemplate']['dom_enabled']) ? 
$GLOBALS['phpgw_info']['etemplate']['dom_enabled'] : '',
-                               'method' => $method,
-                               'hooked' => $hooked != '' ? $hooked : 
isset($GLOBALS['phpgw_info']['etemplate']['hook_content']) ? 
$GLOBALS['phpgw_info']['etemplate']['hook_content'] : ''
+                               'extension_data' => 
$GLOBALS['phpgw_info']['etemplate']['extension_data'],
+                               'to_process' => 
$GLOBALS['phpgw_info']['etemplate']['to_process'],
+                               'java_script' => 
$GLOBALS['phpgw_info']['etemplate']['java_script'],
+                               'dom_enabled' => 
$GLOBALS['phpgw_info']['etemplate']['dom_enabled'],
+                               'hooked' => $hooked != '' ? $hooked : 
$GLOBALS['phpgw_info']['etemplate']['hook_content']
                        ),$id);
 
                        if ($return_html)
@@ -174,8 +180,7 @@
                                {
                                        echo parse_navbar();
                                }
-                               echo 
(isset($GLOBALS['phpgw_info']['etemplate']['hook_content']) ? 
$GLOBALS['phpgw_info']['etemplate']['hook_content'] : '')
-                                       . $html;
+                               echo 
$GLOBALS['phpgw_info']['etemplate']['hook_content'].$html;
 
                                if 
(address@hidden'phpgw_info']['etemplate']['hooked'] &&
                                        (!isset($_GET['menuaction']) || 
strstr($_SERVER['PHP_SELF'],'process_exec.php')))
@@ -186,19 +191,17 @@
                        else
                        {
                                
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $html));
-                               
$GLOBALS['phpgw']->xslttpl->add_file('app_data');
-                               $GLOBALS['phpgw']->xslttpl->pparse();           
                
                        }
                }
 
-               /**
-                * Makes the necessary adjustments to _POST before it calls the 
app's method
-               *
-                * This function is only to submit forms to, create with exec.
-                * All eTemplates / forms executed with exec are submited to 
this function
-                * (via the global index.php and menuaction). It then calls 
process_show
-                * for the eTemplate (to adjust the content of the _POST) and
-                * ExecMethod's the given callback from the app with the 
content of the form as first argument.
+               /*!
+               @function process_exec
+               @abstract Makes the necessary adjustments to _POST before it 
calls the app's method
+               @discussion This function is only to submit forms to, create 
with exec.
+               @discussion All eTemplates / forms executed with exec are 
submited to this function
+               @discussion (via the global index.php and menuaction). It then 
calls process_show
+               @discussion for the eTemplate (to adjust the content of the 
_POST) and
+               @discussion ExecMethod's the given callback from the app with 
the content of the form as first argument.
                 */
                function process_exec()
                {
@@ -229,8 +232,7 @@
                        $content = 
$this->complete_array_merge($session_data['changes'],$content);
                        //echo "process_exec($this->name) 
merge(changes,content) ="; _debug_array($content);
 
-                       if ( isset($GLOBALS['phpgw_info']['etemplate']['loop'])
-                               && $GLOBALS['phpgw_info']['etemplate']['loop'] )
+                       if ($GLOBALS['phpgw_info']['etemplate']['loop'])
                        {
                                if ($session_data['hooked'] != '')      // set 
previous phpgw_body if we are called as hook
                                {
@@ -261,7 +263,7 @@
                        {
                                $disabled = substr($disabled,1);
                        }
-                       @list($val,$check_val) = $vals = explode('=',$disabled);
+                       list($val,$check_val) = $vals = explode('=',$disabled);
 
                        if ($val[0] == '@')
                        {
@@ -277,22 +279,22 @@
                        return $result;
                }
 
-               /**
-                * creates HTML from an eTemplate
-               *
-                * This is done by calling show_cell for each cell in the form. 
show_cell itself
-                * calls show recursivly for each included eTemplate.
-                * You can use it in the UI-layer of an app, just make shure to 
call process_show !!!
-                * This is intended as internal function and should NOT be 
called by new app's direct,
-                * as it deals with HTML and is so UI-dependent, use exec 
instead.
-                * @param $content array with content for the cells, keys are 
the names given in the cells/form elements
-                * @param $sel_options array with options for the selectboxes, 
keys are the name of the selectbox
-                * @param $readonlys array with names of cells/form-elements to 
be not allowed to change
-                * @param            This is to facilitate complex ACL's which 
denies access on field-level !!!
-                * @param $cname basename of names for form-elements, means 
index in $_POST
-                * @param        eg. $cname='cont', element-name = 'name' 
returned content in $_POST['cont']['name']
-                * @param $show_xxx row,col name/index for name expansion
-                * @return the generated HTML
+               /*!
+               @function show
+               @abstract creates HTML from an eTemplate
+               @discussion This is done by calling show_cell for each cell in 
the form. show_cell itself
+               @discussion calls show recursivly for each included eTemplate.
+               @discussion You can use it in the UI-layer of an app, just make 
shure to call process_show !!!
+               @discussion This is intended as internal function and should 
NOT be called by new app's direct,
+               @discussion as it deals with HTML and is so UI-dependent, use 
exec instead.
+               @param $content array with content for the cells, keys are the 
names given in the cells/form elements
+               @param $sel_options array with options for the selectboxes, 
keys are the name of the selectbox
+               @param $readonlys array with names of cells/form-elements to be 
not allowed to change
+               @param            This is to facilitate complex ACL's which 
denies access on field-level !!!
+               @param $cname basename of names for form-elements, means index 
in $_POST
+               @param        eg. $cname='cont', element-name = 'name' returned 
content in $_POST['cont']['name']
+               @param $show_xxx row,col name/index for name expansion
+               @result the generated HTML
                 */
                function 
show($content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0,
                        $no_table_tr=False,$tr_class='')
@@ -332,7 +334,7 @@
                                if (!(list($r_key) = each($this->data)))        
// no further row
                                {
                                        if 
(!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
-                                               
!($this->autorepeat_idx(isset($cols['B']) ? $cols['B'] : 
'',1,$r,$idx,$idx_cname) && $idx_cname) ||
+                                               
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
                                                
!$this->isset_array($content,$idx))
                                        {
                                                break;                          
// no auto-row-repeat
@@ -341,32 +343,13 @@
                                else
                                {
                                        $cols = &$this->data[$r_key];
-                                       if(isset($opts["h$row"]))
-                                       {
                                                list($height,$disabled) = 
explode(',',$opts["h$row"]);
-                                       }
-                                       else
-                                       {
-                                               $height ='';
-                                               $disabled= '';
-                                       }
-                                       if(isset($opts["c$row"]))
-                                       {
                                                $class = $no_table_tr ? 
$tr_class : $opts["c$row"];
                                        }
-                                       else
-                                       {
-                                               $class = '';
-                                       }
-                               }
                                if ($disabled != '' && 
$this->check_disabled($disabled,$content))
                                {
                                        continue;       // row is disabled
                                }
-                               if(!isset($rows[".$row"]))
-                               {
-                                       $rows[".$row"] = '';
-                               }
                                $rows[".$row"] .= 
$this->html->formatOptions($height,'HEIGHT');
                                list($cl) = explode(',',$class);
                                if ($cl == 'nmr' || $cl == 'row')
@@ -390,40 +373,18 @@
                                                        break;  // no 
auto-col-repeat
                                                }
                                        }
-                                       else if(isset($c_key) && 
isset($cols[$c_key]))
-                                       {
-                                               $cell = &$cols[$c_key];
-                                               if(isset($opts[$col]))
-                                               {
-                                                       $col_disabled = '';
-                                                       $tmp = 
explode(',',$opts[$col]);
-                                                       $col_width = $tmp[0];
-                                                       if ( count($tmp) == 2 )
-                                                       {
-                                                               $col_disabled = 
$tmp[1];
-                                                       }
-                                                       unset($tmp);
-                                               }
                                                else
                                                {
-                                                       $col_width=0;
-                                                       $col_disabled=false;
-                                               }
+                                               $cell = &$cols[$c_key];
+                                               list($col_width,$col_disabled) 
= explode(',',$opts[$col]);
                                                
-                                               if (!isset($cell['height']))    
// if not set, cell-height = height of row
+                                               if (!$cell['height'])   // if 
not set, cell-height = height of row
                                                {
                                                        $cell['height'] = 
$height;
                                                }
-                                               if (!isset($cell['width']))     
// if not set, cell-width = width of column or table
-                                               {
-                                                       if(isset($cell['span']))
+                                               if (!$cell['width'])    // if 
not set, cell-width = width of column or table
                                                        {
                                                                list($col_span) 
= explode(',',$cell['span']);
-                                                       }
-                                                       else
-                                                       {
-                                                               $col_span = '';
-                                                       }
                                                        if ($col_span == 'all' 
&& !$c)
                                                        {
                                                                
list($cell['width']) = explode(',',$this->size);
@@ -434,8 +395,7 @@
                                                        }
                                                }
                                        }
-                                       if ( isset($cell['type']) && 
isset($cell['onchange'])
-                                               && $cell['type'] == 'template' 
&& $cell['onchange'])
+                                       if ($cell['type'] == 'template' && 
$cell['onchange'])
                                        {
                                                $cell['tr_class'] = $cl;
                                        }
@@ -450,11 +410,7 @@
                                                unset($row_data[$col]); // omit 
empty/disabled cells if only one row
                                                continue;
                                        }
-                                       if(!isset($row_data[".$col"]))
-                                       {
-                                               $row_data[".$col"] = '';
-                                       }
-                                       if (isset($cell['onclick']) && 
$cell['onclick'])        // can only be set via source at the moment
+                                       if ($cell['onclick'])   // can only be 
set via source at the moment
                                        {
                                                $row_data[".$col"] .= ' 
onClick="'.$cell['onclick'].'"';
 
@@ -474,53 +430,29 @@
                                        }
                                        else
                                        {
-                                               if(isset($opts[$col]))
-                                               {
-                                                       $disable = '';
-                                                       $tmp = explode(',', 
$opts[$col]);
-                                                       $width = $tmp[0];
-                                                       if ( count($tmp) == 2 )
-                                                       {
-                                                               $disable = 
$tmp[1];
-                                                       }
-                                                       unset($tmp);
-
+                                               list($width,$disable) = 
explode(',',$opts[$col]);
                                                        if ($width)             
// width only once for a non colspan cell
                                                        {
-                                                               
$row_data[".$col"] .= " width=\"$width\"";
+                                                       $row_data[".$col"] .= " 
WIDTH=\"$width\"";
                                                                $opts[$col] = 
"0,$disable";
                                                        }
                                                }
-                                       }
-                                       if(isset($cell['align']))
-                                       {
                                                $row_data[".$col"] .= 
$this->html->formatOptions($cell['align'],'ALIGN');
-                                       }
-                                       if(isset($cell['span']))
-                                       {
-                                               $cl = 
explode(',',$cell['span']);
-                                               $cl = isset($cl[1]) ? $cl[1] : 
'';
+                                       list(,$cl) = explode(',',$cell['span']);
                                                $cl = 
$this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl,
                                                        
$c,$r,$show_c,$show_row,$content);
                                                $row_data[".$col"] .= 
$this->html->formatOptions($cl,'CLASS');
                                        }
-                               }
                                $rows[$row] = $row_data;
                        }
-                       if ( 
!isset($GLOBALS['phpgw_info']['etemplate']['styles_included'][$this->name])
-                               || 
!$GLOBALS['phpgw_info']['etemplate']['styles_included'][$this->name] )
+                       if 
(!$GLOBALS['phpgw_info']['etemplate']['styles_included'][$this->name])
                        {
                                $style = $this->html->style($this->style);
                                
$GLOBALS['phpgw_info']['etemplate']['styles_included'][$this->name] = True;
                        }
                        $html = 
$this->html->table($rows,$this->html->formatOptions($this->size,'WIDTH,HEIGHT,BORDER,CLASS,CELLSPACING,CELLPADDING'),$no_table_tr);
 
-                       $tmpa = explode(',',$this->size);
-                       $width = isset($tmpa[0]) ? $tmpa[0] : '';
-                       $height = isset($tmpa[1]) ? $tmpa[1] : '';
-                       $overflow = isset($tmpa[6]) ? $tmpa[6] : '';
-                       unset($tmpa);
-
+                       list($width,$height,,,,,$overflow) = 
explode(',',$this->size);
                        if (!empty($overflow)) {
                                $div_style=' STYLE="'.($width?"width: $width; 
":'').($height ? "height: $height; ":'')."overflow: $overflow\"";
                                $html = $this->html->div($html,$div_style);
@@ -528,43 +460,29 @@
                        return "\n\n<!-- BEGIN $this->name 
-->\n$style\n".$html."<!-- END $this->name -->\n\n";
                }
 
-               /**
-                * generates HTML for 1 input-field / cell
-               *
-                * calls show to generate included eTemplates. Again only an 
INTERMAL function.
-                * @param $cell array with data of the cell: name, type, ...
-                * @param for rest see show
-                * @return the generated HTML
+               /*!
+               @function show_cell
+               @abstract generates HTML for 1 input-field / cell
+               @discussion calls show to generate included eTemplates. Again 
only an INTERMAL function.
+               @param $cell array with data of the cell: name, type, ...
+               @param for rest see show
+               @result the generated HTML
                 */
                function 
show_cell($cell,$content,$sel_options,$readonlys,$cname,$show_c,$show_row,&$span)
                {
-                       $options = '';
                        if (is_int($this->debug) && $this->debug >= 3 || 
$this->debug == $cell['type'])
                        {
                                echo 
"<p>etemplate.show_cell($this->name,name='${cell['name']}',type='${cell['type']}',cname='$cname')</p>\n";
                        }
-
-                       if(isset($cell['span']))
-                       {
                                list($span) = explode(',',$cell['span']);       
// evtl. overriten later for type template
-                       }
-                       else
-                       {
-                               $span = '';
-                       }
 
-                       $name = isset($cell['name']) ? $cell['name'] : '';
-                       $name_parts = array();
-                       if(isset($cell['name']))
-                       {
-                               if (isset($cell['name'][0]) && $cell['name'][0] 
== '@' && $cell['type'] != 'template')
+                       if ($cell['name'][0] == '@' && $cell['type'] != 
'template')
                                {
                                        $cell['name'] = 
$this->get_array($content,substr($cell['name'],1));
                                }
-               //              $name = 
$this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
-                               $name_parts = 
explode('[',str_replace(']','',$cell['name']));
-                       }
+                       $name = 
$this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 
+                       $name_parts = explode('[',str_replace(']','',$name));
                        if (!empty($cname))
                        {
                                array_unshift($name_parts,$cname);
@@ -576,16 +494,11 @@
                        }
                        $value = $this->get_array($content,$name);
 
-                       if ( ( isset($cell['readonly']) && $readonly = 
$cell['readonly']) 
-                               || (isset($readonlys[$name]) && 
$readonlys[$name] && !is_array($readonlys[$name]))                              
-               //              || (isset($readonlys[$cell['name']]) && 
$readonlys[$cell['name']] && !is_array($readonlys[$cell['name']])) 
-                               || isset($readonlys['__ALL__']) )
+                       if ($readonly = $cell['readonly'] || 
(@$readonlys[$name] && !is_array($readonlys[$name])) || $readonlys['__ALL__'])
                        {
-                               $options .= ' readonly';
+                               $options .= ' READONLY';
                        }
-
-                       if ( (isset($cell['disabled']) && $cell['disabled']) 
-                               || $readonlys && ( isset($cell['type']) && 
$cell['type'] == 'button') && ( isset($cell['size']) && 
!strstr($cell['size'],',') ) )
+                       if ($cell['disabled'] || $readonly && $cell['type'] == 
'button' && !strstr($cell['size'],','))
                        {
                                if ($this->rows == 1) {
                                        return '';      // if only one row omit 
cell
@@ -595,64 +508,29 @@
                        }
                        $extra_label = True;
 
-                       $sub_type = '';
-                       $cell_type = explode('-', $cell['type']);
-                       $type = $cell_type[0];
-                       if ( count($cell_type) == 2 )
-                       {
-                               $sub_type = $cell_type[1];
-                       }
-                       if (((!isset($this->types[$cell['type']]) || 
!$this->types[$cell['type']]) || !empty($sub_type)) && 
$this->haveExtension($type,'pre_process'))
+                       list($type,$sub_type) = explode('-',$cell['type']);
+                       if ((!$this->types[$cell['type']] || !empty($sub_type)) 
&& $this->haveExtension($type,'pre_process'))
                        {
                                $ext_type = $type;
                                $extra_label = 
$this->extensionPreProcess($ext_type,$form_name,$value,$cell,$readonlys[$name]);
 
-                               $readonly = (isset($readonly) && $readonly) || 
(isset($cell['readonly']) && $cell['readonly']); // might be set be extension
+                               $readonly = $readonly || $cell['readonly'];     
// might be set be extension
                                $this->set_array($content,$name,$value);
                        }
-
-                       $cell_options =  '';
-                       if ( isset($cell['size']) )
-                       {
                                $cell_options = $cell['size'];
-                       }
-                       if ( strlen($cell_options) && $cell_options[0] == '@')
+                       if ($cell_options[0] == '@')
                        {
                                $cell_options = 
$this->get_array($content,substr($cell_options,1));
                        }
-
-                       if ( !isset($cell['label']) )
-                       {
-                               $cell['label'] = '';
-                       }
                        $label = 
$this->expand_name($cell['label'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
-
-                       $help = '';
-                       if ( isset($cell['help']) )
-                       {
                                $help = $cell['help'];
-                       }
-                       if ( isset($help[0]) && $help[0] == '@')
+                       if ($help[0] == '@')
                        {
                                $help = 
$this->get_array($content,substr($help,1));
                        }
+                       $blur = $cell['blur'][0] == '@' ? 
$this->get_array($content,substr($cell['blur'],1)) :
+                               (strlen($cell['blur']) <= 1 ? $cell['blur'] : 
lang($cell['blur']));
 
-                       $blur = '';
-                       if ( isset($call['blur']) )
-                       {
-                               if ( $cell['blur'][0] == '@' )
-                               {
-                                       $blur = 
$this->get_array($content,substr($cell['blur'],1));
-                               }
-                               else if ( strlen($cell['blur']) <= 1 )
-                               {
-                                       $blur = $cell['blur'];
-                               }
-                               $blur = lang($blur);
-                       }
-
-                       $onBlur = '';
-                       $onFocus = '';
                        if ($this->java_script())
                        {
                                if ($blur)
@@ -666,7 +544,7 @@
                                }
                                if ($help)
                                {
-                                       if ( isset($cell['no_lang']) && 
$cell['no_lang'] < 2)
+                                       if ($cell['no_lang'] < 2)
                                        {
                                                $help = lang($help);
                                        }
@@ -682,7 +560,7 @@
                                {
                                        $options .= " onFocus=\"$onFocus\" 
onBlur=\"$onBlur\"";
                                }
-                               if ( isset($cell['onchange']) && 
$cell['onchange'] && $cell['type'] != 'button') // values != '1' can only set 
by a program (not in the editor so fa
+                               if ($cell['onchange'] && $cell['type'] != 
'button') // values != '1' can only set by a program (not in the editor so fa
                                {
                                        $options .= ' 
onChange="'.($cell['onchange']=='1'?'this.form.submit();':$cell['onchange']).'"';
                                }
@@ -691,24 +569,14 @@
                        {
                                $options = "ID=\"$form_name\" $options";
                        }
-
-                       $html = '';
-                       switch ($cell['type'])
+                       list($type,$sub_type) = explode('-',$cell['type']);
+                       switch ($type)
                        {
                                case 'label':           //  size: 
[[b]old][[i]talic][,link]
                                        if (is_array($value))
-                                       {
                                                break;
-                                       }
-                                       $extra_link = '';
-                                       $tmp = explode(',', $cell_options);
-                                       $style = $tmp[0];
-                                       if ( count($tmp) == 2 )
-                                       {
-                                               $extra_link = $tmp[1];
-                                       }
-                                       unset($tmp);
-                                       $value = strlen($value) > 1 && ( 
!isset($cell['no_lang']) || !$cell['no_lang']) ? lang($value) : $value;
+                                       list($style,$extra_link) = 
explode(',',$cell_options);
+                                       $value = strlen($value) > 1 && 
!$cell['no_lang'] ? lang($value) : $value;
                                        $value = 
nl2br(htmlspecialchars($value));
                                        if ($value != '' && strstr($style,'b')) 
$value = $this->html->bold($value);
                                        if ($value != '' && strstr($style,'i')) 
$value = $this->html->italic($value);
@@ -720,19 +588,14 @@
                                        break;
                                case 'int':             // size: 
[min][,[max][,len]]
                                case 'float':
-                                       $tmp = explode(',', $cell_options);
-                                       $min = $tmp[0];
-                                       $max = isset($tmp[1]) ? $tmp[1] : '';
-                                       $cell_options = isset($tmp[2]) ? 
$tmp[2] : '';
-                                       unset($tmp);
-
+                                       list($min,$max,$cell_options) = 
explode(',',$cell_options);
                                        if ($cell_options == '')
                                        {
                                                $cell_options = $cell['type'] 
== 'int' ? 5 : 8;
                                        }
                                        // fall-through
                                case 'text':            // size: 
[length][,maxLength]
-                                       if (isset($readonly) && $readonly)
+                                       if ($readonly)
                                        {
                                                $html .= 
$this->html->bold(htmlspecialchars($value));
                                        }
@@ -762,9 +625,9 @@
                                        }
                                        if ($value)
                                        {
-                                               $options .= ' checked';
+                                               $options .= ' CHECKED';
                                        }
-                                       if ( isset($readonly) && $readonly)
+                                       if ($readonly)
                                        {
                                                $html .= $value ? 
$this->html->bold($ro_true) : $ro_false;
                                        }
@@ -796,7 +659,7 @@
                                        break;
                                case 'button':
                                        list($app) = explode('.',$this->name);
-                                       if ($this->java_script() && 
isset($cell['onchange']) && $cell['onchange'] != '' && !$cell['needed']) // use 
a link instead of a button
+                                       if ($this->java_script() && 
$cell['onchange'] != '' && !$cell['needed']) // use a link instead of a button
                                        {
                                                if ($cell['onchange'] == 1)
                                                {
@@ -812,28 +675,18 @@
                                        }
                                        else
                                        {
-                                               $ro_img = '';
-                                               $tmp = explode(',', 
$cell_options);
-                                               $img = $tmp[0];
-                                               if ( count($tmp) == 2 )
-                                               {
-                                                       $ro_img = $tmp[1];
-                                               }
-                                               unset($tmp);
-
+                                               list($img,$ro_img) = 
explode(',',$cell_options);
                                                if (!empty($img))
                                                {
-                                                       $options .= ' 
title="'.(strlen($label)<=1||isset($cell['no_lang']) && 
$cell['no_lang']?$label:lang($label)).'"';
+                                                       $options .= ' 
TITLE="'.(strlen($label)<=1||$cell['no_lang']?$label:lang($label)).'"';
                                                }
-                                               $html .= ( !isset($readonly) || 
!$readonly )  
-                                                                       ? 
$this->html->submit_button($form_name,$label, isset($cell['onchange']) ? 
$cell['onchange'] : '', strlen($label) <= 1 || isset($cell['no_lang']) 
,$options, $img, $app) 
-                                                                       : 
$this->html->image($app,$ro_img);
+                                               $html .= !$readonly ? 
$this->html->submit_button($form_name,$label,$cell['onchange'],
+                                                       strlen($label) <= 1 || 
$cell['no_lang'],$options,$img,$app) :
+                                                       
$this->html->image($app,$ro_img);
                                        }
                                        $extra_label = False;
-                                       if (!isset($readonly) || !$readonly )
-                                       {
+                                       if (!$readonly)
                                                
$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
-                                       }
                                        break;
                                case 'hrule':
                                        $html .= $this->html->hr($cell_options);
@@ -847,7 +700,7 @@
                                                echo "<p>Object in Name in tpl 
'$this->name': "; _debug_array($this->data);
                                        }
                                        $obj_read = 'already loaded';
-                                       if ( !isset($cell['obj']) || 
!is_object($cell['obj']))
+                                       if (!is_object($cell['obj']))
                                        {
                                                if ($cell['name'][0] == '@')
                                                {
@@ -885,19 +738,10 @@
                                                }
                                                //echo 
"<p>show_cell-autorepeat($name,$show_c,$show_row,cname='$cname',idx='$idx',idx_cname='$idx_cname',span='$span'):
 content ="; _debug_array($content);
                                        }
-                                       if ( isset($readonly) && $readonly)
+                                       if ($readonly)
                                        {
                                                $readonlys['__ALL__'] = True;
                                        }
-                                       if ( !isset($cell['onchange']) )
-                                       {
-                                               $cell['onchange'] = '';
-                                       }
-
-                                       if ( !isset($cell['tr_class']) )
-                                       {
-                                               $cell['tr_class'] = '';
-                                       }
                                        $html = 
$cell['obj']->show($content,$sel_options,$readonlys,$cname,$show_c,$show_row,$cell['onchange'],$cell['tr_class']);
                                        break;
                                case 'select':  // size:[linesOnMultiselect]
@@ -944,15 +788,14 @@
                                        {
                                                $sels += 
$content["options-$name"];
                                        }
-                                       if ( isset($readonly) && $readonly )
+                                       if ($readonly)
                                        {
                                                $html .= $cell['no_lang'] ? 
$sels[$value] : lang($sels[$value]);
                                        }
                                        else
                                        {
                                                $html .= 
$this->html->select($form_name.($multiple > 1 ? '[]' : ''),$value,$sels,
-                                                       isset($cell['no_lang']) 
? $cell['no_lang'] : '',
-                                                       $options,$multiple);
+                                                       
$cell['no_lang'],$options,$multiple);
                                                
$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
                                        }
                                        break;
@@ -992,34 +835,22 @@
                                                        }
                                                        
$rows[$box_row][$box_col] = $html = $h;
                                                        $box_anz++;
-                                                       if ( 
isset($cell[$n]['align']) && $cell[$n]['align'] )
+                                                       if ($cell[$n]['align'])
                                                        {
                                                                
$rows[$box_row]['.'.$box_col] = 
$this->html->formatOptions($cell[$n]['align'],'ALIGN');
                                                        }
-                                                       $cl = '';
-                                                       if ( 
isset($cell[$n]['span']) )
-                                                       {
-                                                               $tmp = 
explode(',',$cell[$n]['span']);
-                                                               if ( 
count($tmp) == 2 )
-                                                               {
-                                                                       $cl = 
$tmp[1];
-                                                               }
-                                                       }
+                                                       list(,$cl) = 
explode(',',$cell[$n]['span']);
                                                        $cl = 
$this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl,
                                                                
$show_c,$show_row,$content['.c'],$content['.row'],$content);
-                                                       if ( 
!isset($rows[$box_row][".$box_col"]) )
-                                                       {
-                                                               
$rows[$box_row][".$box_col"] = '';
-                                                       }
-                                                       
$rows[$box_row][".$box_col"] .= $this->html->formatOptions($cl, 'CLASS');
+                                                       
$rows[$box_row]['.'.$box_col] .= $this->html->formatOptions($cl,'CLASS');
                                                }
                                        }
                                        if ($box_anz > 1)       // a single 
cell is NOT placed into a table
                                        {
-                                               $html = "\n\n<!-- BEGIN 
{$cell['type']} -->\n\n".
+                                               $html = "\n\n<!-- BEGIN 
$cell[type] -->\n\n".
                                                        
$this->html->table($rows,$this->html->formatOptions($cell_options,',CELLPADDING,CELLSPACING').
-                                                       (isset($cell['align']) 
&& $cell['align'] && $type == 'vbox' ? ' width="100%"' : '')).   // alignment 
only works if table has full width - 100% tables break IE
-                                                       "\n\n<!-- END 
{$cell['type']} -->\n\n";
+                                                       ($cell['align'] && 
$type == 'vbox' ? ' WIDTH="100%"' : '')).    // alignment only works if table 
has full width
+                                                       "\n\n<!-- END 
$cell[type] -->\n\n";
                                        }
                                        break;
                                case 'deck':
@@ -1067,7 +898,7 @@
                                        }
                                        break;
                        }
-                       if ( isset($ext_type) && $ext_type && !$readonly && 
$this->haveExtension($ext_type,'post_process'))     // extension-processing 
need to be after all other and only with diff. name
+                       if ($ext_type && !$readonly && 
$this->haveExtension($ext_type,'post_process'))  // extension-processing need 
to be after all other and only with diff. name
                        {       // unset it first, if it is already set, to be 
after the other widgets of the ext.
                                
unset($GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name]);
                                
$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = 
'ext-'.$ext_type;
@@ -1080,7 +911,7 @@
                        }
                        if ($extra_label && ($label != '' || $html == ''))
                        {
-                               if (strlen($label) > 1 && 
!(isset($cell['no_lang']) && $cell['no_lang'] && $cell['label'] != $label || 
(isset($cell['no_lang']) && $cell['no_lang'] == 2)) )
+                               if (strlen($label) > 1 && !($cell['no_lang'] && 
$cell['label'] != $label || $cell['no_lang'] == 2))
                                {
                                        $label = lang($label);
                                }
@@ -1099,7 +930,7 @@
                                        $html = '&nbsp;';
                                }
                        }
-                       if ( isset($extra_link) && $extra_link )
+                       if ($extra_link)
                        {
                                $extra_link = 
$this->expand_name($extra_link,$show_c,$show_row,$content['.c'],$content['.row'],$content);
                                if ($extra_link[0] == '@')
@@ -1117,15 +948,16 @@
                }
 
 
-               /**
-                * makes necessary adjustments on _POST after a eTemplate / 
form gots submitted
-               *
-                * This is only an internal function, dont call it direct use 
only exec
-                * Process_show uses a list of input-fields/widgets generated 
by show.
-                * @param $content _POST[$cname]
-                * @param $to_process list of widgets/form-fields to process
-                * @param $cname basename of our returnt content (same as in 
call to show)
-                * @return the adjusted content (by using the var-param 
&$content)
+               /*!
+               @function process_show
+               @abstract makes necessary adjustments on _POST after a 
eTemplate / form gots submitted
+               @discussion This is only an internal function, dont call it 
direct use only exec
+               @discussion Process_show uses a list of input-fields/widgets 
generated by show.
+               @syntax process_show(&$content,$to_process,$cname='')
+               @param $content _POST[$cname]
+               @param $to_process list of widgets/form-fields to process
+               @param $cname basename of our returnt content (same as in call 
to show)
+               @result the adjusted content (by using the var-param &$content)
                 */
                function process_show(&$content,$to_process,$cname='')
                {
@@ -1158,14 +990,7 @@
                                        $value = '';    // blur-values is equal 
to emtpy
                                }
                                //echo "<p>process_show($this->name) $type: 
$form_name = '$value'</p>\n";
-                               $sub = '';
-                               $tmp = explode('-', $type);
-                               $type = $tmp[0];
-                               if ( count($tmp) == 2 )
-                               {
-                                       $sub = $tmp[1];
-                               }
-                               unset($tmp);
+                               list($type,$sub) = explode('-',$type);
                                switch ($type)
                                {
                                        case 'ext':
@@ -1233,15 +1058,17 @@
                        }
                }
 
-               /**
-                * is javascript enabled?
-                *
-                * this should be tested by the api at login
-                * @return true if javascript is enabled or not yet tested and 
$consider_not_tested_as_enabled 
+               /*!
+               @function java_script
+               @syntax java_script( $consider_not_tested_as_enabled = True )
+               @author ralfbecker
+               @abstract is javascript enabled?
+               @discussion this should be tested by the api at login
+               @result true if javascript is enabled or not yet tested and 
$consider_not_tested_as_enabled 
                 */
                function java_script($consider_not_tested_as_enabled = True)
                {
-                       $ret = ( 
isset($GLOBALS['phpgw_info']['etemplate']['java_script']) && 
$GLOBALS['phpgw_info']['etemplate']['java_script']) ||
+                       $ret = 
!!$GLOBALS['phpgw_info']['etemplate']['java_script'] ||
                                $consider_not_tested_as_enabled && 
!isset($GLOBALS['phpgw_info']['etemplate']['java_script']);
                        //echo 
"<p>java_script($consider_not_tested_as_enabled)='$ret', 
java_script='".$GLOBALS['phpgw_info']['etemplate']['java_script']."', 
isset(java_script)=".isset($GLOBALS['phpgw_info']['etemplate']['java_script'])."</p>\n";
                        
@@ -1252,15 +1079,16 @@
                                
$GLOBALS['phpgw_info']['etemplate']['java_script'].'' == '');
                }
 
-               /**
-                * returns the javascript to be included by exec
-                *
-                * @param $what &1 = returns the test, note: has to be included 
in the body, not the header\
-                *      &2 = returns the common functions, best to be included 
in the header
+               /*!
+               @function include_java_script
+               @syntax include_java_script(  )
+               @author ralfbecker
+               @abstract returns the javascript to be included by exec
+               @param $what &1 = returns the test, note: has to be included in 
the body, not the header\
+                       &2 = returns the common functions, best to be included 
in the header
                 */
                function include_java_script($what = 3)
                {
-                       $js = '';
                        // this is to test if javascript is enabled
                        if ($what & 1 && 
!isset($GLOBALS['phpgw_info']['etemplate']['java_script']))
                        {

Index: inc/class.uietemplate_gtk.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.uietemplate_gtk.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.uietemplate_gtk.inc.php   6 Sep 2006 11:13:30 -0000       1.14
+++ inc/class.uietemplate_gtk.inc.php   10 Feb 2007 16:03:46 -0000      1.15
@@ -1,25 +1,31 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.uietemplate_gtk.inc.php,v 1.14 2006/09/06 11:13:30 
skwashd Exp $
-*/
+       
/**************************************************************************\
+       * phpGroupWare - EditableTemplates - GTK User Interface                 
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Written by Ralf Becker <address@hidden>                  *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id: class.uietemplate_gtk.inc.php,v 1.15 2007/02/10 16:03:46 
sigurdne Exp $ */
+
        include_once(PHPGW_INCLUDE_ROOT . 
'/etemplate/inc/class.boetemplate.inc.php');
 
-       /**
-        * creates dialogs / HTML-forms from eTemplate descriptions
-        *
-        * etemplate or uietemplate extends boetemplate, all vars and public 
functions are inherited
-        * $tmpl = createObject('etemplate.etemplate','app.template.name');
-        * $tmpl->exec('app.class.callback',$content_to_show);
-        * This creates a form from the eTemplate 'app.template.name' and takes 
care that
-        * the method / public function 'callback' in (bo)class 'class' of 
'app' gets called
-        * if the user submitts the form. Vor the complete param's see the 
description of exec.
-        * @param $debug enables debug messages: 0=no, 1=calls to show and 
process_show, 2=content of process_show
-        * @param                                3=calls to show_cell OR 
template- or cell-type name
+       /*!
+       @class etemplate
+       @author ralfbecker
+       @abstract creates dialogs / HTML-forms from eTemplate descriptions
+       @discussion etemplate or uietemplate extends boetemplate, all vars and 
public functions are inherited
+       @example $tmpl = 
CreateObject('etemplate.etemplate','app.template.name');
+       @example $tmpl->exec('app.class.callback',$content_to_show);
+       @example This creates a form from the eTemplate 'app.template.name' and 
takes care that
+       @example the method / public function 'callback' in (bo)class 'class' 
of 'app' gets called
+       @example if the user submitts the form. Vor the complete param's see 
the description of exec.
+       @param $debug enables debug messages: 0=no, 1=calls to show and 
process_show, 2=content of process_show
+       @param                                3=calls to show_cell OR template- 
or cell-type name
         */
        class etemplate extends boetemplate
        {
@@ -35,10 +41,10 @@
                );
                var $font_width=8;
 
-               /**
-                * constructor of etemplate class, reads an eTemplate if $name 
is given
-               *
-                * @param as soetemplate.read
+               /*!
+               @function etemplate
+               @abstract constructor of etemplate class, reads an eTemplate if 
$name is given
+               @param as soetemplate.read
                 */
                function 
etemplate($name='',$template='default',$lang='default',$group=0,$version='',$rows=2,$cols=2)
                {
@@ -55,24 +61,24 @@
                        return True;
                }
 
-               /**
-                * Generats a Dialog from an eTemplate - abstract the UI-layer
-               *
-                * This is the only function an application should use, all 
other are INTERNAL and
-                * do NOT abstract the UI-layer, because they return HTML.
-                * Generates a webpage with a form from the template and puts 
process_exec in the
-                * form as submit-url to call process_show for the template 
before it
-                * ExecuteMethod's the given $methode of the caller.
-                * @param $methode Methode (e.g. 'etemplate.editor.edit') to be 
called if form is submitted
-                * @param $content Array with content to fill the input-fields 
of template, eg. the text-field
-                * @param          with name 'name' gets its content from 
$content['name']
-                * @param $sel_options Array or arrays with the options for 
each select-field, keys are the
-                * @param              field-names, eg. array('name' => array(1 
=> 'one',2 => 'two')) set the
-                * @param              options for field 'name'. 
($content['options-name'] is possible too !!!)
-                * @param $readonlys Array with field-names as keys for fields 
with should be readonly
-                * @param            (eg. to implement ACL grants on 
field-level or to remove buttons not applicable)
-                * @param $preserv Array with vars which should be transported 
to the $method-call (eg. an id) array('id' => $id) sets $_POST['id'] for the 
$method-call
-                * @return nothing
+               /*!
+               @function exec
+               @abstract Generats a Dialog from an eTemplate - abstract the 
UI-layer
+               @discussion This is the only function an application should 
use, all other are INTERNAL and
+               @discussion do NOT abstract the UI-layer, because they return 
HTML.
+               @discussion Generates a webpage with a form from the template 
and puts process_exec in the
+               @discussion form as submit-url to call process_show for the 
template before it
+               @discussion ExecuteMethod's the given $methode of the caller.
+               @param $methode Methode (e.g. 'etemplate.editor.edit') to be 
called if form is submitted
+               @param $content Array with content to fill the input-fields of 
template, eg. the text-field
+               @param          with name 'name' gets its content from 
$content['name']
+               @param $sel_options Array or arrays with the options for each 
select-field, keys are the
+               @param              field-names, eg. array('name' => array(1 => 
'one',2 => 'two')) set the
+               @param              options for field 'name'. 
($content['options-name'] is possible too !!!)
+               @param $readonlys Array with field-names as keys for fields 
with should be readonly
+               @param            (eg. to implement ACL grants on field-level 
or to remove buttons not applicable)
+               @param $preserv Array with vars which should be transported to 
the $method-call (eg. an id) array('id' => $id) sets $HTTP_POST_VARS['id'] for 
the $method-call
+               @result nothing
                 */
                function 
exec($method,$content,$sel_options='',$readonlys='',$preserv='')
                {
@@ -146,10 +152,10 @@
                        ExecMethod($method,array_merge($this->result,$preserv));
                }
 
-               /**
-                * this is only an empty function for the GTK ui
-               *
-                * @return the adjusted content (in the simplest case that 
would be $content)
+               /*!
+               @function process_show
+               @abstract this is only an empty function for the GTK ui
+               @result the adjusted content (in the simplest case that would 
be $content)
                 */
                function process_show(&$content,$readonlys='')
                {
@@ -243,22 +249,22 @@
                        }
                }
 
-               /**
-                * creates HTML from an eTemplate
-               *
-                * This is done by calling show_cell for each cell in the form. 
show_cell itself
-                * calls show recursivly for each included eTemplate.
-                * You can use it in the UI-layer of an app, just make shure to 
call process_show !!!
-                * This is intended as internal function and should NOT be 
called by new app's direct,
-                * as it deals with HTML and is so UI-dependent, use exec 
instead.
-                * @param $content array with content for the cells, keys are 
the names given in the cells/form elements
-                * @param $sel_options array with options for the selectboxes, 
keys are the name of the selectbox
-                * @param $readonlys array with names of cells/form-elements to 
be not allowed to change
-                * @param            This is to facilitate complex ACL's which 
denies access on field-level !!!
-                * @param $cname basename of names for form-elements, means 
index in $_POST
-                * @param        eg. $cname='cont', element-name = 'name' 
returned content in $_POST['cont']['name']
-                * @param $show_xxx row,col name/index for name expansion
-                * @return the generated HTML
+               /*!
+               @function show
+               @abstract creates HTML from an eTemplate
+               @discussion This is done by calling show_cell for each cell in 
the form. show_cell itself
+               @discussion calls show recursivly for each included eTemplate.
+               @discussion You can use it in the UI-layer of an app, just make 
shure to call process_show !!!
+               @discussion This is intended as internal function and should 
NOT be called by new app's direct,
+               @discussion as it deals with HTML and is so UI-dependent, use 
exec instead.
+               @param $content array with content for the cells, keys are the 
names given in the cells/form elements
+               @param $sel_options array with options for the selectboxes, 
keys are the name of the selectbox
+               @param $readonlys array with names of cells/form-elements to be 
not allowed to change
+               @param            This is to facilitate complex ACL's which 
denies access on field-level !!!
+               @param $cname basename of names for form-elements, means index 
in $HTTP_POST_VARS
+               @param        eg. $cname='cont', element-name = 'name' returned 
content in $HTTP_POST_VARS['cont']['name']
+               @param $show_xxx row,col name/index for name expansion
+               @result the generated HTML
                 */
                function 
show(&$result,$content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0)
                {
@@ -422,13 +428,13 @@
                                                                                
$event->area->x, $event->area->y);
                }
 
-               /**
-                * generates HTML for 1 input-field / cell
-               *
-                * calls show to generate included eTemplates. Again only an 
INTERMAL function.
-                * @param $cell array with data of the cell: name, type, ...
-                * @param for rest see show
-                * @return the generated HTML
+               /*!
+               @function show_cell
+               @abstract generates HTML for 1 input-field / cell
+               @discussion calls show to generate included eTemplates. Again 
only an INTERMAL function.
+               @param $cell array with data of the cell: name, type, ...
+               @param for rest see show
+               @result the generated HTML
                 */
                function 
show_cell($cell,$content,$sel_options,$readonlys,$cname,$show_c,$show_row,&$span,&$result)
                {

Index: inc/class.xmltool.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.xmltool.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.xmltool.inc.php   6 Sep 2006 11:13:30 -0000       1.5
+++ inc/class.xmltool.inc.php   10 Feb 2007 16:03:46 -0000      1.6
@@ -1,12 +1,4 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Assumming Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author ???
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.xmltool.inc.php,v 1.5 2006/09/06 11:13:30 skwashd Exp $
-*/
        function var2xml($name, $data)
        {
                $doc = new xmltool('root','','');

Index: inc/class.xslt_widget.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.xslt_widget.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.xslt_widget.inc.php       6 Sep 2006 11:13:30 -0000       1.3
+++ inc/class.xslt_widget.inc.php       10 Feb 2007 16:03:46 -0000      1.4
@@ -1,18 +1,27 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.xslt_widget.inc.php,v 1.3 2006/09/06 11:13:30 skwashd 
Exp $
-*/
-       /**
-        * widget that generates its html-output via a xslt file with its in 
$options and the content as xml
-        *
-        * The following data is placed in the xml: 
value,name,label(translated),statustext(translated),readonly
-        * and all widget-attributes as descript in the referenz, using there 
xml-names.
-        * This widget is generating html, so it does not work (without an 
extra implementation) in an other UI
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.xslt_widget.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $ */
+
+       /*!
+       @class xslt_widget
+       @author ralfbecker
+       @abstract widget that generates its html-output via a xslt file with 
its in $options and the content as xml
+       @discussion The following data is placed in the xml: 
value,name,label(translated),statustext(translated),readonly
+       @discussion and all widget-attributes as descript in the referenz, 
using there xml-names.
+       @discussion This widget is generating html, so it does not work 
(without an extra implementation) in an other UI
         */
        class xslt_widget
        {
@@ -25,7 +34,7 @@
 
                function xslt_widget($ui='')
                {
-                       $this->xslttemplates = 
createObject('phpgwapi.xslttemplates',PHPGW_INCLUDE_ROOT);
+                       $this->xslttemplates = 
CreateObject('phpgwapi.xslttemplates',PHPGW_INCLUDE_ROOT);
 
                        switch($ui)
                        {

Index: inc/class.xul_io.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.xul_io.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- inc/class.xul_io.inc.php    6 Sep 2006 11:13:30 -0000       1.25
+++ inc/class.xul_io.inc.php    10 Feb 2007 16:03:46 -0000      1.26
@@ -1,12 +1,20 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: class.xul_io.inc.php,v 1.25 2006/09/06 11:13:30 skwashd Exp $
-*/
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: class.xul_io.inc.php,v 1.26 2007/02/10 16:03:46 sigurdne Exp $ */
+
 
        if (!function_exists('var2xml'))
        {

Index: inc/get_var.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/get_var.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/get_var.php     6 Sep 2006 11:13:30 -0000       1.2
+++ inc/get_var.php     10 Feb 2007 16:03:46 -0000      1.3
@@ -13,7 +13,7 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: get_var.php,v 1.2 2006/09/06 11:13:30 skwashd Exp $ */
+ /* $Id: get_var.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
        function reg_var($varname, $method = 'any', $valuetype = 
'alphanumeric',$default_value='',$register=True)
        {
                if($method == 'any')

Index: setup/etemplates.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/etemplates.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- setup/etemplates.inc.php    6 Sep 2006 11:13:30 -0000       1.37
+++ setup/etemplates.inc.php    10 Feb 2007 16:03:46 -0000      1.38
@@ -1,7 +1,7 @@
 <?php
 // eTemplates for Application 'etemplate', generated by etemplate.dump() 
2003-08-20 02:26
 
-/* $Id: etemplates.inc.php,v 1.37 2006/09/06 11:13:30 skwashd Exp $ */
+/* $Id: etemplates.inc.php,v 1.38 2007/02/10 16:03:46 sigurdne Exp $ */
 
 $templ_data[] = array('name' => 'etemplate.datefield','template' => '','lang' 
=> '','group' => '0','version' => '0.9.15.001','data' => 
'a:2:{i:0;a:0:{}i:1;a:3:{s:1:\"A\";a:4:{s:4:\"type\";s:3:\"int\";s:4:\"size\";s:4:\"1,31\";s:4:\"name\";s:1:\"d\";s:4:\"help\";s:3:\"Day\";}s:1:\"B\";a:4:{s:4:\"type\";s:3:\"int\";s:4:\"size\";s:4:\"1,12\";s:4:\"name\";s:1:\"m\";s:4:\"help\";s:5:\"Month\";}s:1:\"C\";a:4:{s:4:\"type\";s:3:\"int\";s:4:\"size\";s:4:\"1900\";s:4:\"name\";s:1:\"Y\";s:4:\"help\";s:4:\"Year\";}}}','size'
 => '','style' => '','modified' => '1032907904',);
 

Index: setup/phpgw_de.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/phpgw_de.lang,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- setup/phpgw_de.lang 22 Feb 2006 06:10:03 -0000      1.9
+++ setup/phpgw_de.lang 10 Feb 2007 16:03:46 -0000      1.10
@@ -1,30 +1,30 @@
-%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       de      %1 (%2 neue) Texte für die Anwendung '%3' und die 
Sprache '%4' geschrieben
-%1 etemplates deleted  etemplate       de      %1 eTemplates gelöscht
-%1 etemplates for application '%2' dumped to '%3'      etemplate       de      
%1 eTemplates für die Anwendung '%2' nach '%3' geschrieben
+%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       de      %1 (%2 neue) Texte für die Anwendung '%3' und die 
Sprache '%4' geschrieben
+%1 etemplates deleted  etemplate       de      %1 eTemplates gelöscht
+%1 etemplates for application '%2' dumped to '%3'      etemplate       de      
%1 eTemplates für die Anwendung '%2' nach '%3' geschrieben
 %1 etemplates found    etemplate       de      %1 eTemplates gefunden
 %1 matches on search criteria  etemplate       de      %1 Treffer bei der Suche
-%1 new etemplates imported for application '%2'        etemplate       de      
%1 neue eTemplates importiert für die Anwendung '%2'
+%1 new etemplates imported for application '%2'        etemplate       de      
%1 neue eTemplates importiert für die Anwendung '%2'
 %s disabled    etemplate       de      %s deaktiviert
-%s needed      etemplate       de      %s benötigt
-%s notranslation       etemplate       de      %s nicht übersetzen
+%s needed      etemplate       de      %s benötigt
+%s notranslation       etemplate       de      %s nicht übersetzen
 %s onchange    etemplate       de      %s onChange
 %s readonly    etemplate       de      %s Schreibschutz
 a pattern to be searched for   etemplate       de      ein Muster nach dem 
gesucht werden soll
-add a new column (after the existing ones)     etemplate       de      Neue 
Spalte hinzufügen (hinter den bestehenden)
-add column     etemplate       de      Spalte zufügen
-add table      etemplate       de      Tabelle zufügen
+add a new column (after the existing ones)     etemplate       de      Neue 
Spalte hinzufügen (hinter den bestehenden)
+add column     etemplate       de      Spalte zufügen
+add table      etemplate       de      Tabelle zufügen
 align  etemplate       de      Ausrichtung
 alignment of label and input-field in table-cell       etemplate       de      
Ausrichtung der Beschriftung und des Eingabefeldes in der Tabellenzelle
 alignment of the v/hbox containing table-cell  etemplate       de      
Ausrichtung der die V/HBox enthaltenden Tabellenzelle
 am     etemplate       de      Vormittag
 an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       de      eine indizierte Spalte beschleunigt Anfragen 
die diese benutzen (kostet Plattenplatz !!!)
 application    etemplate       de      Anwendung
-application name needed to write a langfile or dump the etemplates !!! 
etemplate       de      Name der Anwendung benötigt um eine Sprachdatei oder 
eTemplate-Distibutionsdate zu schreiben !!!
-attach etemplate       de      Anhängen
-attach file    etemplate       de      Datei anhängen
+application name needed to write a langfile or dump the etemplates !!! 
etemplate       de      Name der Anwendung benötigt um eine Sprachdatei oder 
eTemplate-Distibutionsdate zu schreiben !!!
+attach etemplate       de      Anhängen
+attach file    etemplate       de      Datei anhängen
 blurtext       etemplate       de      blurText
 border etemplate       de      Rand
-border-line-thickness for the table-tag        etemplate       de      
Randbreite (border) für die Tabelle
+border-line-thickness for the table-tag        etemplate       de      
Randbreite (border) für die Tabelle
 can have special sql-value null        etemplate       de      darf speziellen 
SQL Wert NULL annehmen
 cancel etemplate       de      Abbruch
 category       etemplate       de      Kategorie
@@ -32,19 +32,19 @@
 cells  etemplate       de      Zellen
 cellspacing for the table-tag  etemplate       de      Zellenabstand 
(cellspacing) der Tabelle
 center etemplate       de      Zentriert
-check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       de      abhaken wenn der Inhalt nur angezeigt 
aber nicht geändert werden soll (der Inhalt wird dann nicht zurückgesendet!)
-check if field has to be filled by user        etemplate       de      abhaken 
wenn das Eingabefeld vom Benutzer zwingend ausgefüllt werden muss
+check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       de      abhaken wenn der Inhalt nur angezeigt 
aber nicht geändert werden soll (der Inhalt wird dann nicht zurückgesendet!)
+check if field has to be filled by user        etemplate       de      abhaken 
wenn das Eingabefeld vom Benutzer zwingend ausgefüllt werden muss
 checkbox       etemplate       de      Checkbox
 class  etemplate       de      Class
 class, valign  etemplate       de      Class, Valign
-click here to attach the file  etemplate       de      hier clicken um die 
Datei anzuhängen
-click here to create the link  etemplate       de      hier clicken um die 
Verknüpfung anzulegen
+click here to attach the file  etemplate       de      hier clicken um die 
Datei anzuhängen
+click here to create the link  etemplate       de      hier clicken um die 
Verknüpfung anzulegen
 click here to start the search etemplate       de      hier clicken um die 
Suche zu starten
 click here to upload the file  etemplate       de      hier clicken um die 
Datei hochzuladen
 columnname     etemplate       de      Spaltenname
 comment        etemplate       de      Kommentar
-create a new table for the application etemplate       de      Neue Tabelle 
für die Anwendung anlegen
-creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       de      erzeugt eine englische ('en') Sprachdatei aus 
den Beschriftungen und Hilfetexten (für die Anwendung in Name)
+create a new table for the application etemplate       de      Neue Tabelle 
für die Anwendung anlegen
+creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       de      erzeugt eine englische ('en') Sprachdatei aus 
den Beschriftungen und Hilfetexten (für die Anwendung in Name)
 css class for the table-tag    etemplate       de      CSS class der Tabelle
 css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = 
alternating nm row, 'nmr0'+'nmr1' nm rows       etemplate       de      Name 
der CSS class dieser Zeile, vorbelegt sind: 'th' = Kopfzeile, 'row' = 
zeilenweise wechselnde Farbe bzw. 'row_on', 'row_off'
 css-styles     etemplate       de      CSS Stile
@@ -55,53 +55,53 @@
 db-tools       etemplate       de      DB-Tools
 deck   etemplate       de      Deck (intern)
 default        etemplate       de      Vorgabe
-delete etemplate       de      Löschen
-delete a single entry by passing the id.       etemplate       de      Löscht 
einen einzelnen Eintrag über seine Id.
-delete all selected etemplates, without further inquiry        etemplate       
de      löscht ALLE ausgewählten eTemplates OHNE weitere Rückfrage
-delete column  etemplate       de      Spalte löschen
-delete this etemplate  etemplate       de      dieses eTemplate löschen
-delete whole column (can not be undone!!!)     etemplate       de      ganze 
Zeile löschen (kann NICHT rückgängig gemacht werden)
-deletes the above spez. etemplate from the database, can not be undone 
etemplate       de      löscht das oben spezifiziert eTemplate aus der 
Datenbank, kann NICHT rückgängig gemacht werden
-deletes the etemplate spez. above      etemplate       de      löscht das 
oben spezifizierte eTemplate
-deletes this column    etemplate       de      Löscht diese Spalte
-discard changes        etemplate       de      verwirft Änderungen
-displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       de      wird vor 
dem Eingabefeld angezeigt oder das Feld wird für ein '%s' eingefügt 
(Beschriftung einer Schaltfläche oder Dateiname eine Grafik)
+delete etemplate       de      Löschen
+delete a single entry by passing the id.       etemplate       de      Löscht 
einen einzelnen Eintrag über seine Id.
+delete all selected etemplates, without further inquiry        etemplate       
de      löscht ALLE ausgewählten eTemplates OHNE weitere Rückfrage
+delete column  etemplate       de      Spalte löschen
+delete this etemplate  etemplate       de      dieses eTemplate löschen
+delete whole column (can not be undone!!!)     etemplate       de      ganze 
Zeile löschen (kann NICHT rückgängig gemacht werden)
+deletes the above spez. etemplate from the database, can not be undone 
etemplate       de      löscht das oben spezifiziert eTemplate aus der 
Datenbank, kann NICHT rückgängig gemacht werden
+deletes the etemplate spez. above      etemplate       de      löscht das oben 
spezifizierte eTemplate
+deletes this column    etemplate       de      Löscht diese Spalte
+discard changes        etemplate       de      verwirft Änderungen
+displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       de      wird vor 
dem Eingabefeld angezeigt oder das Feld wird für ein '%s' eingefügt 
(Beschriftung einer Schaltfläche oder Dateiname eine Grafik)
 displayed in statusline of browser if input-field gets focus   etemplate       
de      wird in der Statuszeile des Browsers angezeit, wenn das Eingabefeld 
angesprochen wird
-do you want to save the changes you made in table %s?  etemplate       de      
Wollen Sie die Änderungen in der Tabelle '%s' speichern?
-drop a table - this can not be undone  etemplate       de      Tabelle 
löschen (drop) - NICHT rückgänig zu machen
-drop table     etemplate       de      Tabelle löschen
+do you want to save the changes you made in table %s?  etemplate       de      
Wollen Sie die Änderungen in der Tabelle '%s' speichern?
+drop a table - this can not be undone  etemplate       de      Tabelle löschen 
(drop) - NICHT rückgänig zu machen
+drop table     etemplate       de      Tabelle löschen
 dump4setup     etemplate       de      Dump4Setup
 edit   etemplate       de      Bearbeiten
 edit the etemplate spez. above etemplate       de      das oben spezifizierte 
eTemplate bearbeiten
 editable templates - db-tools  etemplate       de      eTemplates - DB-Tools
-editable templates - delete template   etemplate       de      eTemplates - 
Löschen
+editable templates - delete template   etemplate       de      eTemplates - 
Löschen
 editable templates - editor    etemplate       de      eTemplates - Bearbeiten
 editable templates - search    etemplate       de      eTemplates - Suchen
 editable templates - show template     etemplate       de      eTemplates - 
Anzeigen
-embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       de      eingebette CSS Stile, zb. '.red { background: red; }' 
(man beachte den '.' vor der CSS class) or '@import url(...)' (Angaben gelten 
für die gesamte Seite!)
-enable javascript onchange submit      etemplate       de      JavaScript 
absenden bei Änderung (onChange) aktivieren
-enter '' for an empty default, nothing mean no default etemplate       de      
'' für einen leeren Vorgabewert eingeben, nichts bedeutet keine Vorgabe
+embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       de      eingebette CSS Stile, zb. '.red { background: red; }' 
(man beachte den '.' vor der CSS class) or '@import url(...)' (Angaben gelten 
für die gesamte Seite!)
+enable javascript onchange submit      etemplate       de      JavaScript 
absenden bei Änderung (onChange) aktivieren
+enter '' for an empty default, nothing mean no default etemplate       de      
'' für einen leeren Vorgabewert eingeben, nichts bedeutet keine Vorgabe
 enter a search pattern etemplate       de      Suchmuster eingeben
-enter filename to upload and attach, use [browse...] to search for it  
etemplate       de      Dateinamen zum Hochland oder Anhängen eingeben, 
[Browse ...] zum Suchen verwenden
-enter the new version number here (> old_version), empty for no update-file    
etemplate       de      Neue Versionsnummer eingeben (größer als alte), leer 
wenn keine Update-Datei erzeugt werden soll
-enter the new version number here (has to be > old_version)    etemplate       
de      Neue Versionsnummer eingeben (muss größer als die alte sein)
+enter filename to upload and attach, use [browse...] to search for it  
etemplate       de      Dateinamen zum Hochland oder Anhängen eingeben, [Browse 
...] zum Suchen verwenden
+enter the new version number here (> old_version), empty for no update-file    
etemplate       de      Neue Versionsnummer eingeben (größer als alte), leer 
wenn keine Update-Datei erzeugt werden soll
+enter the new version number here (has to be > old_version)    etemplate       
de      Neue Versionsnummer eingeben (muss größer als die alte sein)
 entry saved    etemplate       de      Eintrag gespeichert
 error: template not found !!!  etemplate       de      Fehler: eTemplate nicht 
gefunden !!!
 error: webserver is not allowed to write into '%1' !!! etemplate       de      
Fehler: der Webserver hat keine Schreibberechtigung in '%1' !!!
 error: while saveing !!!       etemplate       de      Fehler: beim Speichern 
!!!
 error: writeing !!!    etemplate       de      Fehler: schreiben !!!
-error: writing file (no write-permission for the webserver) !!!        
etemplate       de      Fehler: Datei schreiben (keine Schreibberechtigung für 
den Webserver) !!!
+error: writing file (no write-permission for the webserver) !!!        
etemplate       de      Fehler: Datei schreiben (keine Schreibberechtigung für 
den Webserver) !!!
 etemplate      common  de      eTemplate
 etemplate '%1' imported, use save to put it in the database    etemplate       
de      eTemplate '%1' importiert, benutze Speichern um es in der Datenbank 
abzulegen
 etemplate '%1' written to '%2' etemplate       de      eTemplate '%1' wurde 
nach '%2' geschrieben
 etemplate editor       etemplate       de      eTemplate Editor
-exchange this row with the one above   etemplate       de      diese Zeile mit 
der darüber austauschen
+exchange this row with the one above   etemplate       de      diese Zeile mit 
der darüber austauschen
 exchange this two columns      etemplate       de      diese beiden Spalten 
austauschen
 export the loaded etemplate into a xml-file    etemplate       de      das 
geladene eTemplate als XML Datei (.xet) exportieren
 export xml     etemplate       de      XML Export
 extensions loaded:     etemplate       de      Erweiterungen geladen:
 file   etemplate       de      Datei
-file contains more than one etemplate, last one is shown !!!   etemplate       
de      Datei enthält mehr als ein eTemplate, das letzte wird angezeigt !!!
+file contains more than one etemplate, last one is shown !!!   etemplate       
de      Datei enthält mehr als ein eTemplate, das letzte wird angezeigt !!!
 file writen    etemplate       de      Datei geschrieben
 fileupload     etemplate       de      DateiUpload
 first  etemplate       de      Zuerst
@@ -109,13 +109,13 @@
 foreign key    etemplate       de      Foreign Key
 go to the first entry  etemplate       de      gehe zum ersten Eintrag
 go to the last entry   etemplate       de      gege zum letzten Eintrag
-go to the next page of entries etemplate       de      gehe zur nächsten Seite
+go to the next page of entries etemplate       de      gehe zur nächsten Seite
 go to the previous page of entries     etemplate       de      gehe zur 
vorherigen Seite
 hbox   etemplate       de      HBox
-height etemplate       de      Höhe
-height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       de  
    Höhe der Zeile (in % oder Pixel), Zeile ausschalten: [! = 
nicht]<wert>=[<prüfung>]: eg. 'address@hidden' schaltet Zeile aus, wenn Inhalt 
von data leer ist
-height of the table in % or pixels for the table-tag and (optional) div        
etemplate       de      Höhe der Tabelle in % oder Punkten
-height, disabled       etemplate       de      Höhe, Deaktiviert
+height etemplate       de      Höhe
+height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       de  
    Höhe der Zeile (in % oder Pixel), Zeile ausschalten: [! = 
nicht]<wert>=[<prüfung>]: eg. 'address@hidden' schaltet Zeile aus, wenn Inhalt 
von data leer ist
+height of the table in % or pixels for the table-tag and (optional) div        
etemplate       de      Höhe der Tabelle in % oder Punkten
+height, disabled       etemplate       de      Höhe, Deaktiviert
 help   etemplate       de      Hilfe
 horizontal rule        etemplate       de      Waagrechte Linie
 hour   etemplate       de      Stunde
@@ -126,50 +126,50 @@
 import an etemplate from a xml-file    etemplate       de      Importiert ein 
eTemplate aus einer XML Datei
 import table-definitions from existing db-table        etemplate       de      
Importiert die Tabellen-Definition aus einer bestehenden Datenbank-Tabelle
 import xml     etemplate       de      XML Import
-index/name of returned content (name of the template, link / method for image) 
etemplate       de      Index / Name des zurückgelieferten Inhalts (Name des 
eTemplates oder Link/Methode für Grafik)
+index/name of returned content (name of the template, link / method for image) 
etemplate       de      Index / Name des zurückgelieferten Inhalts (Name des 
eTemplates oder Link/Methode für Grafik)
 indexed        etemplate       de      Indiziert
-insert new column behind this one      etemplate       de      Neue Spalte 
hinter dieser einfügen
-insert new column in front of all      etemplate       de      Neue Spalte vor 
dieser einfüben
-insert new row after this one  etemplate       de      Neue Zeile nach dieser 
einfügen
-insert new row in front of first line  etemplate       de      Neue Zeile vor 
dieser einfügen
+insert new column behind this one      etemplate       de      Neue Spalte 
hinter dieser einfügen
+insert new column in front of all      etemplate       de      Neue Spalte vor 
dieser einfüben
+insert new row after this one  etemplate       de      Neue Zeile nach dieser 
einfügen
+insert new row in front of first line  etemplate       de      Neue Zeile vor 
dieser einfügen
 integer        etemplate       de      Ganzzahl
-key    etemplate       de      Schlüssel
+key    etemplate       de      Schlüssel
 label  etemplate       de      Beschriftung
 label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] 
t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] 
select:[multiselect] date:[values: eg. 'y-m-d']    etemplate       de      
Beschriftung:[bold][italic] Text:[len][,max] Zahlen:[min][,[max][,len]] 
mehrz.Text:[Zeilen][,Spalten] Radiok.:Wert Templ.:[IndexInContent] 
Auswahl:[mehrzeilig] Datum:[Format: zB. 'Y-m-d']
 lang   etemplate       de      Sprache
-language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       de      Kürzel der Sprache (zb. 'en' für 
Englisch) für sprachabhänige Template ('' ließt die bevorzugte Sprache, 
benutze 'default' für das standard Template '')
+language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       de      Kürzel der Sprache (zb. 'en' für 
Englisch) für sprachabhänige Template ('' ließt die bevorzugte Sprache, benutze 
'default' für das standard Template '')
 last   etemplate       de      Letzte
 left   etemplate       de      Links
-length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       de      Länge für char+varchar, Genauigkeit für int: 2, 4, 8 
und float: 4, 8
-link   etemplate       de      Verknüpfung
-linklist       etemplate       de      VerknüpfungListe
-linkstring     etemplate       de      VerküpfungZeichenkette
-linkto etemplate       de      VerküpfungZu
-load this template into the editor     etemplate       de      lädt diese 
Template zum Bearbeiten
+length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       de      Länge für char+varchar, Genauigkeit für int: 2, 4, 8 
und float: 4, 8
+link   etemplate       de      Verknüpfung
+linklist       etemplate       de      VerknüpfungListe
+linkstring     etemplate       de      VerküpfungZeichenkette
+linkto etemplate       de      VerküpfungZu
+load this template into the editor     etemplate       de      lädt diese 
Template zum Bearbeiten
 minute etemplate       de      Minute
 month  etemplate       de      Monat
 name   etemplate       de      Name
-name of other table where column is a key from etemplate       de      Name 
der anderen Tabelle von der diese Spalte ein Schlüssel ist
-name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       de      
Name des phpGW layouts (zb. verdilak): '' = Standard (ließt das bevorzugte 
Layout, benutze 'default' um das standard Layout '' zu lesen)
-name of table to add   etemplate       de      Name der zuzufügenden Tabelle
+name of other table where column is a key from etemplate       de      Name 
der anderen Tabelle von der diese Spalte ein Schlüssel ist
+name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       de      
Name des phpGW layouts (zb. verdilak): '' = Standard (ließt das bevorzugte 
Layout, benutze 'default' um das standard Layout '' zu lesen)
+name of table to add   etemplate       de      Name der zuzufügenden Tabelle
 name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       de      Name des eTemplate, in der Form 
anwendung.funktion[.subTemplate]
-need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       de    
  muss für die Tabelle einmalig sein und darf ein reserviertes Wort von SQL 
sein, am besten alle mit einem gemeinsammen Kürzel der Anwendung beginnen: zb. 
'et_'
+need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       de    
  muss für die Tabelle einmalig sein und darf ein reserviertes Wort von SQL 
sein, am besten alle mit einem gemeinsammen Kürzel der Anwendung beginnen: zb. 
'et_'
 new search     etemplate       de      Neue Suche
 new table created      etemplate       de      Neue Tabelle erzeugt
 newer version '%1' exists !!!  etemplate       de      Neuere Version '%1' 
existiert !!!
 nextmatch      etemplate       de      Nextmatch
 no file        etemplate       de      keine Datei
-no filename given or selected via browse...    etemplate       de      kein 
Dateiname angegeben oder mit [Browse...] ausgewählt
+no filename given or selected via browse...    etemplate       de      kein 
Dateiname angegeben oder mit [Browse...] ausgewählt
 nothing found - try again !!!  etemplate       de      Nichts gefunden - 
nochmal versuchen !!!
 nothing matched search criteria !!!    etemplate       de      Nicht gefunden 
bei diesem Suchkriterium !!!
 nullable       etemplate       de      Nullable
-number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       de      Anzahl 
der Spalten die ein Feld überspannt oder 'all' für die übrigen Spalten, CSS 
class Name (für das TD-tag)
+number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       de      Anzahl 
der Spalten die ein Feld überspannt oder 'all' für die übrigen Spalten, CSS 
class Name (für das TD-tag)
 number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
de      Anzahl Zeilen/Spalten der V/HBox, Innenabstand (Cellpadding), 
Zellenabstand (Cellspacing)
 of     etemplate       de      von
 only an other version found !!!        etemplate       de      nur eine andere 
Version gefunden !!!
-optional note about the link   etemplate       de      optionale Notiz zur 
Verknüpfung
+optional note about the link   etemplate       de      optionale Notiz zur 
Verknüpfung
 options        etemplate       de      Optionen
-overflow       etemplate       de      Überbreite
+overflow       etemplate       de      Überbreite
 padding        etemplate       de      Innenabstand
 please enter table-name first !!!      etemplate       de      Bitte geben Sie 
zuerst einen Tabellennamen an !!!
 pm     etemplate       de      Nachmittag
@@ -178,42 +178,42 @@
 primary key for the table, gets automaticaly indexed   etemplate       de      
Hauptindex (Primary Key) der Tabelle, wird automatisch indiziert
 radiobutton    etemplate       de      Radioknopf
 read   etemplate       de      Lesen
-read a list of entries.        etemplate       de      Liest eine Liste von 
Einträgen.
-read a single entry by passing the id and fieldlist.   etemplate       de      
Liste einen einzelnen Eintrag durch übergabe seiner Id und Feldliste.
-read etemplate from database (for the keys above)      etemplate       de      
ließt ein eTemplate aus der Datenbank (für die Schlüssel darüber)
-remove row (can not be undone!!!)      etemplate       de      löscht eine 
Zeile (NICHT rückgängig zu machen)
-remove this link (not the entry itself)        etemplate       de      
entfernt diese Verknüpfung (nicht den Eintrag selbst)
-returns savely, without deleting       etemplate       de      Abbruch, OHNE 
zu löschen
+read a list of entries.        etemplate       de      Liest eine Liste von 
Einträgen.
+read a single entry by passing the id and fieldlist.   etemplate       de      
Liste einen einzelnen Eintrag durch übergabe seiner Id und Feldliste.
+read etemplate from database (for the keys above)      etemplate       de      
ließt ein eTemplate aus der Datenbank (für die Schlüssel darüber)
+remove row (can not be undone!!!)      etemplate       de      löscht eine 
Zeile (NICHT rückgängig zu machen)
+remove this link (not the entry itself)        etemplate       de      
entfernt diese Verknüpfung (nicht den Eintrag selbst)
+returns savely, without deleting       etemplate       de      Abbruch, OHNE 
zu löschen
 right  etemplate       de      Rechts
 save   etemplate       de      Speichern
-save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       de      Speichert das eTemplate unter den obigen Schlüsseln 
(name, ...), ändern für ein Speichern unter
-saves changes to tables_current.inc.php        etemplate       de      
Speichert Änderungen in tables_current.inc.php
+save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       de      Speichert das eTemplate unter den obigen Schlüsseln 
(name, ...), ändern für ein Speichern unter
+saves changes to tables_current.inc.php        etemplate       de      
Speichert Änderungen in tables_current.inc.php
 scale  etemplate       de      Scale
-scale for float        etemplate       de      Nachkommastellen für 
Gleitkommawerte
+scale for float        etemplate       de      Nachkommastellen für 
Gleitkommawerte
 search etemplate       de      Suchen
-select a category      etemplate       de      eine Kategorie auswählen
-select a primary contact, to show in the list  etemplate       de      einen 
Hauptkontakt auswählen, der in der Auflistung mit angezeigt wird
-select access  etemplate       de      Zugriff auswählen
-select account etemplate       de      Benutzer auswählen
-select an app first !!!        etemplate       de      Bitte wählen Sie 
zuerst ein Anwendung aus !!!
-select an app to search in     etemplate       de      Anwendung zum 
Durchsuchen auswählen
-select an application  etemplate       de      Anwendung auswählen
-select an application, (*) = uninstalled       etemplate       de      
Anwendung auswählen, (*) = nicht installiert
-select an entry to link with   etemplate       de      Eintrag zum Verküpfen 
auswählen
-select an table of the application     etemplate       de      Tabelle der 
Anwendung auswählen
-select application     etemplate       de      Anwendung auswählen
-select category        etemplate       de      Kategorie auswählen
-select country etemplate       de      Land auswählen
-select day     etemplate       de      Tag auswählen
-select if content of field should not be translated (label gets always 
translated)     etemplate       de      abhaken wenn Inhalt des Feldes nicht 
übersetzt werden soll (Beschriftung wird immer übersetzt)
-select month   etemplate       de      Monat auswählen
-select number  etemplate       de      Zahl auswählen
-select one ... etemplate       de      Eine auswählen ...
-select percentage      etemplate       de      Prozente auswählen
-select priority        etemplate       de      Priorität auswählen
-select state   etemplate       de      US-State auswählen
-select this etemplate to delete it     etemplate       de      dieses 
eTemplate zum Löschen auswählen
-select year    etemplate       de      Jahr auswählen
+select a category      etemplate       de      eine Kategorie auswählen
+select a primary contact, to show in the list  etemplate       de      einen 
Hauptkontakt auswählen, der in der Auflistung mit angezeigt wird
+select access  etemplate       de      Zugriff auswählen
+select account etemplate       de      Benutzer auswählen
+select an app first !!!        etemplate       de      Bitte wählen Sie zuerst 
ein Anwendung aus !!!
+select an app to search in     etemplate       de      Anwendung zum 
Durchsuchen auswählen
+select an application  etemplate       de      Anwendung auswählen
+select an application, (*) = uninstalled       etemplate       de      
Anwendung auswählen, (*) = nicht installiert
+select an entry to link with   etemplate       de      Eintrag zum Verküpfen 
auswählen
+select an table of the application     etemplate       de      Tabelle der 
Anwendung auswählen
+select application     etemplate       de      Anwendung auswählen
+select category        etemplate       de      Kategorie auswählen
+select country etemplate       de      Land auswählen
+select day     etemplate       de      Tag auswählen
+select if content of field should not be translated (label gets always 
translated)     etemplate       de      abhaken wenn Inhalt des Feldes nicht 
übersetzt werden soll (Beschriftung wird immer übersetzt)
+select month   etemplate       de      Monat auswählen
+select number  etemplate       de      Zahl auswählen
+select one ... etemplate       de      Eine auswählen ...
+select percentage      etemplate       de      Prozente auswählen
+select priority        etemplate       de      Priorität auswählen
+select state   etemplate       de      US-State auswählen
+select this etemplate to delete it     etemplate       de      dieses 
eTemplate zum Löschen auswählen
+select year    etemplate       de      Jahr auswählen
 selectbox      etemplate       de      Auswahlbox
 sets today as date     etemplate       de      setzt heutiges Datum
 show   etemplate       de      Anzeigen
@@ -225,14 +225,14 @@
 spacing        etemplate       de      Zellenabstand
 span, class    etemplate       de      Span, Class
 stack  etemplate       de      Stapel
-start a new search, cancel this link   etemplate       de      neue Suche 
Starten, diese Verknüpfung abbrechen
-start new search for the above pattern etemplate       de      neue Suche für 
das obige Muster starten
-submitbutton   etemplate       de      Schaltfläche
-table unchanged, no write necessary !!!        etemplate       de      Tabelle 
nicht geändert, kein schreiben notwendig !!!
+start a new search, cancel this link   etemplate       de      neue Suche 
Starten, diese Verknüpfung abbrechen
+start new search for the above pattern etemplate       de      neue Suche für 
das obige Muster starten
+submitbutton   etemplate       de      Schaltfläche
+table unchanged, no write necessary !!!        etemplate       de      Tabelle 
nicht geändert, kein schreiben notwendig !!!
 tablename      etemplate       de      Tabellenname
 tabs   etemplate       de      Karteikarten
 template       etemplate       de      Template
-template deleted       etemplate       de      Template gelöscht
+template deleted       etemplate       de      Template gelöscht
 template saved etemplate       de      Template gespeichert
 text   etemplate       de      Textfeld
 textarea       etemplate       de      mehrzeiliges Textfeld
@@ -244,18 +244,18 @@
 today  etemplate       de      Heute
 type   etemplate       de      Typ
 type of the column     etemplate       de      Typ der Spalte
-type of the field (select label if field should be empty)      etemplate       
de      Type des Feldes (Beschriftung auswählen wenn Feld leer sein soll)
+type of the field (select label if field should be empty)      etemplate       
de      Type des Feldes (Beschriftung auswählen wenn Feld leer sein soll)
 unique etemplate       de      Unique
-unlink etemplate       de      Lösen
-update a single entry by passing the fields.   etemplate       de      
Aktualisert einen einzelnen Eintrag über seine Felder.
+unlink etemplate       de      Lösen
+update a single entry by passing the fields.   etemplate       de      
Aktualisert einen einzelnen Eintrag über seine Felder.
 update from version '%s' to    etemplate       de      Update von Version '%s' 
auf
 upload etemplate       de      Hochladen
 value  etemplate       de      Wert
 vbox   etemplate       de      VBox
 version        etemplate       de      Version
-version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       de      
Versionsnummer, in der Form major.minor.revision.number (zB. 0.9.15.001 alle 
Zahlen mit Nullen aufgefüllt)
+version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       de      
Versionsnummer, in der Form major.minor.revision.number (zB. 0.9.15.001 alle 
Zahlen mit Nullen aufgefüllt)
 view this linked entry in its application      etemplate       de      Zeige 
diesen Eintrag in seiner Anwendung an
-what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       de      was passiert mit überbreitem 
Inhalt: sichtbar (standard), versteckt, rollend, automatich (der Browser 
entscheidet)
+what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       de      was passiert mit überbreitem 
Inhalt: sichtbar (standard), versteckt, rollend, automatich (der Browser 
entscheidet)
 width  etemplate       de      Breite
 width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       de 
     Breite der Spalte (in % oder Punkten), deaktiviert Spalten: [! = 
nicht]<wert>[=<test>] zB.: 'address@hidden' deaktiviert Spalte wenn data leer 
ist
 width of the table in % or pixels for the table-tag and (optional) div 
etemplate       de      Breite der Tabelle in % oder Punkten
@@ -263,7 +263,7 @@
 write <app>/setup/tables_current.inc.php       etemplate       de      
schreibt <app>/setup/tables_current.inc.php
 write langfile etemplate       de      Sprachdatei
 write tables   etemplate       de      Tabelle Schreiben
-writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       de      schreibt ein Distributionsfile 
'etemplates.inc.php' (für die Anwendung in Name) in das setup Verzeichnis der 
Anwendung
+writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       de      schreibt ein Distributionsfile 
'etemplates.inc.php' (für die Anwendung in Name) in das setup Verzeichnis der 
Anwendung
 xml-file to import     etemplate       de      XML Datei zum Importieren
 xslt template  etemplate       de      XSLT Template
 year   etemplate       de      Jahr

Index: setup/phpgw_fr.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/phpgw_fr.lang,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/phpgw_fr.lang 22 Feb 2006 06:08:24 -0000      1.4
+++ setup/phpgw_fr.lang 10 Feb 2007 16:03:46 -0000      1.5
@@ -1,269 +1,269 @@
-%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       fr      %1 (%2 nouveaux) Messages écrits pour l'Application 
'%3' et les langues '%4'
-%1 etemplates deleted  etemplate       fr      %1 eTemplates effacé(s)
-%1 etemplates for application '%2' dumped to '%3'      etemplate       fr      
%1 eTemplates pour l'Application '%2' écrits dans '%3'
-%1 etemplates found    etemplate       fr      %1 eTemplates trouvé(s)
-%1 matches on search criteria  etemplate       fr      %1 occurences sur les 
critères de recherche
-%1 new etemplates imported for application '%2'        etemplate       fr      
%1 nouveaux eTemplates importés pour l'Application '%2'
-%s disabled    etemplate       fr      %s désactivé
-%s needed      etemplate       fr      %s nécessaire
+%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       fr      %1 (%2 nouveaux) Messages écrits pour l'Application 
'%3' et les langues '%4'
+%1 etemplates deleted  etemplate       fr      %1 eTemplates effacé(s)
+%1 etemplates for application '%2' dumped to '%3'      etemplate       fr      
%1 eTemplates pour l'Application '%2' écrits dans '%3'
+%1 etemplates found    etemplate       fr      %1 eTemplates trouvé(s)
+%1 matches on search criteria  etemplate       fr      %1 occurences sur les 
critères de recherche
+%1 new etemplates imported for application '%2'        etemplate       fr      
%1 nouveaux eTemplates importés pour l'Application '%2'
+%s disabled    etemplate       fr      %s désactivé
+%s needed      etemplate       fr      %s nécessaire
 %s notranslation       etemplate       fr      %s PasDeTraduction
 %s onchange    etemplate       fr      %s surChangement
 %s readonly    etemplate       fr      %s LectureSeule
-a pattern to be searched for   etemplate       fr      Une chaine de 
caractères à rechercher
-add a new column (after the existing ones)     etemplate       fr      Ajouter 
une nouvelle colonne (après celles existant déjà)
+a pattern to be searched for   etemplate       fr      Une chaine de 
caractères à rechercher
+add a new column (after the existing ones)     etemplate       fr      Ajouter 
une nouvelle colonne (après celles existant déjà)
 add column     etemplate       fr      Ajouter une colonne
 add table      etemplate       fr      Ajouter une table
 align  etemplate       fr      Aligner
 alignment of label and input-field in table-cell       etemplate       fr      
Alignement du label et du champ de saisie dans la cellule de la table
 alignment of the v/hbox containing table-cell  etemplate       fr      
Alignement de la boite H/V contenant la cellule de table
 am     etemplate       fr      Matin
-an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       fr      Une colonne indexée accélère les requêtes 
qui utilisent cette colonne (coûte de l'espace disque !!!)
+an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       fr      Une colonne indexée accélère les requêtes qui 
utilisent cette colonne (coûte de l'espace disque !!!)
 application    etemplate       fr      Application
-application name needed to write a langfile or dump the etemplates !!! 
etemplate       fr      L'application Nom a eu besoin d'écrire un fichier de 
langue ou de dumper les eTemplates !!!
+application name needed to write a langfile or dump the etemplates !!! 
etemplate       fr      L'application Nom a eu besoin d'écrire un fichier de 
langue ou de dumper les eTemplates !!!
 attach etemplate       fr      Attacher
 attach file    etemplate       fr      Attacher fichier
-blurtext       etemplate       fr      Texte Brouillé
+blurtext       etemplate       fr      Texte Brouillé
 border etemplate       fr      Bord
 border-line-thickness for the table-tag        etemplate       fr      
Epaisseur de la ligne de bord pour le tag de la table eTemplate
-can have special sql-value null        etemplate       fr      Peut avoir la 
valeur SQL spéciale NULL
+can have special sql-value null        etemplate       fr      Peut avoir la 
valeur SQL spéciale NULL
 cancel etemplate       fr      Annuler
-category       etemplate       fr      Catégorie
+category       etemplate       fr      Catégorie
 cellpadding for the table-tag  etemplate       fr      Remplissage de cellule 
pour le tag de la table
 cells  etemplate       fr      Cellules
 cellspacing for the table-tag  etemplate       fr      Espacement des cellules 
pour le tag de la table
 center etemplate       fr      Centre
-check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       fr      Vérifier si le contenu devrait être 
seulement affiché mais non modifié (le contenu n'est alors pas renvoyé!)
-check if field has to be filled by user        etemplate       fr      
Vérifier si le champ doit êtr rempli par l'utilisateur
-checkbox       etemplate       fr      Boîte à cocher
+check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       fr      Vérifier si le contenu devrait être 
seulement affiché mais non modifié (le contenu n'est alors pas renvoyé!)
+check if field has to be filled by user        etemplate       fr      
Vérifier si le champ doit êtr rempli par l'utilisateur
+checkbox       etemplate       fr      Boîte à cocher
 class  etemplate       fr      Classe
 class, valign  etemplate       fr      classe, alignV
 click here to attach the file  etemplate       fr      Cliquer ici pour 
attacher le fichier
-click here to create the link  etemplate       fr      Cliquer ici pour créer 
le lien
-click here to start the search etemplate       fr      Cliquer ici pour 
démarrer la recherche
+click here to create the link  etemplate       fr      Cliquer ici pour créer 
le lien
+click here to start the search etemplate       fr      Cliquer ici pour 
démarrer la recherche
 click here to upload the file  etemplate       fr      Cliquer ici pour 
uploader le fichier
 columnname     etemplate       fr      NomDeColonne
 comment        etemplate       fr      Commentaire
-create a new table for the application etemplate       fr      Créer une 
nouvelle table pour l'application
-creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       fr      Crée un fichier de lang anglais ('en') à 
partir du label et des textes d'aide (pour l'application dans Nom)
+create a new table for the application etemplate       fr      Créer une 
nouvelle table pour l'application
+creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       fr      Crée un fichier de lang anglais ('en') à 
partir du label et des textes d'aide (pour l'application dans Nom)
 css class for the table-tag    etemplate       fr      Classe CSS pour le tag 
de la table
-css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = 
alternating nm row, 'nmr0'+'nmr1' nm rows       etemplate       fr      Nom de 
la classe CSS pour cette ligne, préréglé: 'nmh' = entête prochaine 
correspondance, 'nmr' = alterne la ligne prochaine correspondance, 
'nmr0'+'nmr1' lignes prochaines correspondances
+css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = 
alternating nm row, 'nmr0'+'nmr1' nm rows       etemplate       fr      Nom de 
la classe CSS pour cette ligne, préréglé: 'nmh' = entête prochaine 
correspondance, 'nmr' = alterne la ligne prochaine correspondance, 
'nmr0'+'nmr1' lignes prochaines correspondances
 css-styles     etemplate       fr      Styles CSS
 date+time      etemplate       fr      Date+Heure
 datum  etemplate       fr      Datum
 day    etemplate       fr      Jour
-db ensures that every row has a unique value in that column    etemplate       
fr      La base de données s'assure que chaque ligne a une valeur unique dans 
cette colonne
-db-tools       etemplate       fr      Outils base de données
+db ensures that every row has a unique value in that column    etemplate       
fr      La base de données s'assure que chaque ligne a une valeur unique dans 
cette colonne
+db-tools       etemplate       fr      Outils base de données
 deck   etemplate       fr      Bureau (interne)
-default        etemplate       fr      Défaut
+default        etemplate       fr      Défaut
 delete etemplate       fr      Effacer
-delete a single entry by passing the id.       etemplate       fr      Effacer 
une unique entrée en passant l'ID.
-delete all selected etemplates, without further inquiry        etemplate       
fr      Effacer TOUS les eTemplates sélectionnés, sans plus demander de 
confirmation
+delete a single entry by passing the id.       etemplate       fr      Effacer 
une unique entrée en passant l'ID.
+delete all selected etemplates, without further inquiry        etemplate       
fr      Effacer TOUS les eTemplates sélectionnés, sans plus demander de 
confirmation
 delete column  etemplate       fr      Effacer la colonne
 delete this etemplate  etemplate       fr      Effacer cet eTemplate
-delete whole column (can not be undone!!!)     etemplate       fr      Effacer 
la colonne entière (ne peut PAS être annulé!!!)
-deletes the above spez. etemplate from the database, can not be undone 
etemplate       fr      Efface le eTemplate spécifié ci-dessus de la base de 
données, ne peut PAS être annulé
-deletes the etemplate spez. above      etemplate       fr      fface le 
eTemplate spécifié ci-dessus
+delete whole column (can not be undone!!!)     etemplate       fr      Effacer 
la colonne entière (ne peut PAS être annulé!!!)
+deletes the above spez. etemplate from the database, can not be undone 
etemplate       fr      Efface le eTemplate spécifié ci-dessus de la base de 
données, ne peut PAS être annulé
+deletes the etemplate spez. above      etemplate       fr      fface le 
eTemplate spécifié ci-dessus
 deletes this column    etemplate       fr      Efface cette colonne
 discard changes        etemplate       fr      Annuler les changements
-displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       fr      affiché 
en face de l'entrée our l'entrée est insérée pour un '%s' dans le label (le 
label du Boutonsoumettre ou le nom du fichierimage)
-displayed in statusline of browser if input-field gets focus   etemplate       
fr      affiché dans la ligne de statut du navigateur si le champ d'entrée a 
le focus
-do you want to save the changes you made in table %s?  etemplate       fr      
Voulez-vous enregistrer les modifications que vous avez effectuées dans la 
table %s?
-drop a table - this can not be undone  etemplate       fr      Détruire une 
table - ceci ne peut PAS être annulé
+displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       fr      affiché 
en face de l'entrée our l'entrée est insérée pour un '%s' dans le label (le 
label du Boutonsoumettre ou le nom du fichierimage)
+displayed in statusline of browser if input-field gets focus   etemplate       
fr      affiché dans la ligne de statut du navigateur si le champ d'entrée a le 
focus
+do you want to save the changes you made in table %s?  etemplate       fr      
Voulez-vous enregistrer les modifications que vous avez effectuées dans la 
table %s?
+drop a table - this can not be undone  etemplate       fr      Détruire une 
table - ceci ne peut PAS être annulé
 drop table     etemplate       fr      Effacer table
-dump4setup     etemplate       fr      DumpPourRéglage
+dump4setup     etemplate       fr      DumpPourRéglage
 edit   etemplate       fr      Modifier
-edit the etemplate spez. above etemplate       fr      Modifier l'eTemplate 
spécifié ci-dessus
-editable templates - db-tools  etemplate       fr      Templates modifiables - 
outils de bases de données
+edit the etemplate spez. above etemplate       fr      Modifier l'eTemplate 
spécifié ci-dessus
+editable templates - db-tools  etemplate       fr      Templates modifiables - 
outils de bases de données
 editable templates - delete template   etemplate       fr      Templates 
modifiables - effacer le template
-editable templates - editor    etemplate       fr      Templates modifiables - 
éditeur
+editable templates - editor    etemplate       fr      Templates modifiables - 
éditeur
 editable templates - search    etemplate       fr      Templates modifiables - 
rechercher
 editable templates - show template     etemplate       fr      Templates 
modifiables - montrer le template
-embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       fr      Styles CSS incorporés, p.e. '.rouge { fond: rouge; 
}' (notez le '.' avant le nom de la classe) ou '@import url(...)' (les noms de 
classe sont globaux pour la page entière!)
+embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       fr      Styles CSS incorporés, p.e. '.rouge { fond: rouge; }' 
(notez le '.' avant le nom de la classe) ou '@import url(...)' (les noms de 
classe sont globaux pour la page entière!)
 enable javascript onchange submit      etemplate       fr      activer la 
soumission sur changement en JavaScript
-enter '' for an empty default, nothing mean no default etemplate       fr      
entrez '' pour une valeur par défaut vide, rien signifie pas de valeur par 
défaut
-enter a search pattern etemplate       fr      Entrez une chaîne de recherche
-enter filename to upload and attach, use [browse...] to search for it  
etemplate       fr      Entrez un nom de fichier à uploader et attacher, 
utilisez [naviguer...] pour le rechercher
-enter the new version number here (> old_version), empty for no update-file    
etemplate       fr      Entrez le nouveau numéro de version ici (> 
ancienne_version), vide pour aucun fichier de mise à jour
-enter the new version number here (has to be > old_version)    etemplate       
fr      Entrez le nouveau numéro de version ici (doit être > à la 
vieille_version)
-entry saved    etemplate       fr      Entrée enregistrée
-error: template not found !!!  etemplate       fr      Erreur: Template non 
trouvé !!!
-error: webserver is not allowed to write into '%1' !!! etemplate       fr      
Erreur: le serveur web n'est pas autorisé à écrire dans '%1' !!!
+enter '' for an empty default, nothing mean no default etemplate       fr      
entrez '' pour une valeur par défaut vide, rien signifie pas de valeur par 
défaut
+enter a search pattern etemplate       fr      Entrez une chaîne de recherche
+enter filename to upload and attach, use [browse...] to search for it  
etemplate       fr      Entrez un nom de fichier à uploader et attacher, 
utilisez [naviguer...] pour le rechercher
+enter the new version number here (> old_version), empty for no update-file    
etemplate       fr      Entrez le nouveau numéro de version ici (> 
ancienne_version), vide pour aucun fichier de mise à jour
+enter the new version number here (has to be > old_version)    etemplate       
fr      Entrez le nouveau numéro de version ici (doit être > à la 
vieille_version)
+entry saved    etemplate       fr      Entrée enregistrée
+error: template not found !!!  etemplate       fr      Erreur: Template non 
trouvé !!!
+error: webserver is not allowed to write into '%1' !!! etemplate       fr      
Erreur: le serveur web n'est pas autorisé à écrire dans '%1' !!!
 error: while saveing !!!       etemplate       fr      Erreur: pendant la 
sauvegarde !!!
-error: writeing !!!    etemplate       fr      Erreur à l'écriture !!!
-error: writing file (no write-permission for the webserver) !!!        
etemplate       fr      Erreur à l'écriture du fichier (pas de permission 
d'écriture pour le serveur web) !!!
+error: writeing !!!    etemplate       fr      Erreur à l'écriture !!!
+error: writing file (no write-permission for the webserver) !!!        
etemplate       fr      Erreur à l'écriture du fichier (pas de permission 
d'écriture pour le serveur web) !!!
 etemplate      common  fr      eTemplate
-etemplate '%1' imported, use save to put it in the database    etemplate       
fr      eTemplate '%1' importé, utilisez Enregistrer pour le mettre dans la 
base de données
-etemplate '%1' written to '%2' etemplate       fr      eTemplate '%1' écrit 
dans '%2'
+etemplate '%1' imported, use save to put it in the database    etemplate       
fr      eTemplate '%1' importé, utilisez Enregistrer pour le mettre dans la 
base de données
+etemplate '%1' written to '%2' etemplate       fr      eTemplate '%1' écrit 
dans '%2'
 etemplate editor       etemplate       fr      Editeur d'eTemplate
 exchange this row with the one above   etemplate       fr      Echanger cette 
ligne avec celle du dessus
 exchange this two columns      etemplate       fr      Echanger ces deux 
colonnes
-export the loaded etemplate into a xml-file    etemplate       fr      
exporter l'eTemplate chargé dans un fichier XML
+export the loaded etemplate into a xml-file    etemplate       fr      
exporter l'eTemplate chargé dans un fichier XML
 export xml     etemplate       fr      Exporter XML
-extensions loaded:     etemplate       fr      Extensions chargées:
+extensions loaded:     etemplate       fr      Extensions chargées:
 file   etemplate       fr      Fichier
-file contains more than one etemplate, last one is shown !!!   etemplate       
fr      Le fichier contient plus d'un eTemplate, le dernier est affiché !!!
-file writen    etemplate       fr      Fichier écrit
+file contains more than one etemplate, last one is shown !!!   etemplate       
fr      Le fichier contient plus d'un eTemplate, le dernier est affiché !!!
+file writen    etemplate       fr      Fichier écrit
 fileupload     etemplate       fr      UploadFichier
 first  etemplate       fr      Premier
 floating point etemplate       fr      Virgule flottante
-foreign key    etemplate       fr      Clé étrangère
-go to the first entry  etemplate       fr      Aller à la première entrée
-go to the last entry   etemplate       fr      Aller à la dernière entrée
-go to the next page of entries etemplate       fr      Aller à la page 
suivante d'entrées
-go to the previous page of entries     etemplate       fr      Aller à la 
page précédente d'entrées
+foreign key    etemplate       fr      Clé étrangère
+go to the first entry  etemplate       fr      Aller à la première entrée
+go to the last entry   etemplate       fr      Aller à la dernière entrée
+go to the next page of entries etemplate       fr      Aller à la page 
suivante d'entrées
+go to the previous page of entries     etemplate       fr      Aller à la page 
précédente d'entrées
 hbox   etemplate       fr      BoiteH
 height etemplate       fr      Hauteur
-height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       fr  
    Hauteur de la ligne (en % ou pixels), désactiver la ligne: [! = 
pas]<valeur>[=<verifier>] p.e.: 'address@hidden' désactive la ligne si le 
contenu de donnees est vide
+height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       fr  
    Hauteur de la ligne (en % ou pixels), désactiver la ligne: [! = 
pas]<valeur>[=<verifier>] p.e.: 'address@hidden' désactive la ligne si le 
contenu de donnees est vide
 height of the table in % or pixels for the table-tag and (optional) div        
etemplate       fr      Hauteur de la table en % ou pixels pour le tag de la 
table et div (optionnel)
-height, disabled       etemplate       fr      Hauteur, désactivé
+height, disabled       etemplate       fr      Hauteur, désactivé
 help   etemplate       fr      Aide
-horizontal rule        etemplate       fr      Régle horizontale
+horizontal rule        etemplate       fr      Régle horizontale
 hour   etemplate       fr      Heure
 html   etemplate       fr      Html
-if field is disabled an empty table-cell is displayed, for (temporal) 
removement of a field/cell       etemplate       fr      Si le champ est 
désactivé une cellule de table vide est affiché, pour enlèvement 
(temporaire) d'un champ/cellule
+if field is disabled an empty table-cell is displayed, for (temporal) 
removement of a field/cell       etemplate       fr      Si le champ est 
désactivé une cellule de table vide est affiché, pour enlèvement (temporaire) 
d'un champ/cellule
 image  etemplate       fr      Image
 import etemplate       fr      Importer
 import an etemplate from a xml-file    etemplate       fr      import an 
eTemplate from a xml-file
-import table-definitions from existing db-table        etemplate       fr      
Importer les définitions de table depuis la table de base de données existante
+import table-definitions from existing db-table        etemplate       fr      
Importer les définitions de table depuis la table de base de données existante
 import xml     etemplate       fr      Importer XML
-index/name of returned content (name of the template, link / method for image) 
etemplate       fr      index/nom du contenu renvoyé (nom du Template, Lien / 
Méthode pour Image)
-indexed        etemplate       fr      Indexé
-insert new column behind this one      etemplate       fr      Insérer une 
nouvelle colonne derrière celle-ci
-insert new column in front of all      etemplate       fr      Insérer une 
nouvelle colonne devant toutes les autres
-insert new row after this one  etemplate       fr      Insérer une nouvelle 
ligne devant celle-ci
-insert new row in front of first line  etemplate       fr      Insérer une 
nouvelle ligne devant la première ligne
+index/name of returned content (name of the template, link / method for image) 
etemplate       fr      index/nom du contenu renvoyé (nom du Template, Lien / 
Méthode pour Image)
+indexed        etemplate       fr      Indexé
+insert new column behind this one      etemplate       fr      Insérer une 
nouvelle colonne derrière celle-ci
+insert new column in front of all      etemplate       fr      Insérer une 
nouvelle colonne devant toutes les autres
+insert new row after this one  etemplate       fr      Insérer une nouvelle 
ligne devant celle-ci
+insert new row in front of first line  etemplate       fr      Insérer une 
nouvelle ligne devant la première ligne
 integer        etemplate       fr      Nombre entier
-key    etemplate       fr      Clé
+key    etemplate       fr      Clé
 label  etemplate       fr      Label
-label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] 
t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] 
select:[multiselect] date:[values: eg. 'y-m-d']    etemplate       fr      
Label:[gras][italique] Texte:[longueur][,max] Nombres:[min][,[max][,longueur]] 
T.aire:[lignes][,colonnes] Radiob.:valeur H.Règle:[largeur] 
Templ.:[IndexDansContenu] Sélect:[multiselection] Date:[valeurs: p.e. 'A-m-j']
+label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] 
t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] 
select:[multiselect] date:[values: eg. 'y-m-d']    etemplate       fr      
Label:[gras][italique] Texte:[longueur][,max] Nombres:[min][,[max][,longueur]] 
T.aire:[lignes][,colonnes] Radiob.:valeur H.Règle:[largeur] 
Templ.:[IndexDansContenu] Sélect:[multiselection] Date:[valeurs: p.e. 'A-m-j']
 lang   etemplate       fr      Langue
-language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       fr      raccourci-langue (p.e. 'en' pour 
english) pour le template dépendant d'un langage ('' lit vos préférences 
pour le langage ou la valeur par défaut, utiliser 'default' pour lire le 
template par défaut '')
+language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       fr      raccourci-langue (p.e. 'en' pour 
english) pour le template dépendant d'un langage ('' lit vos préférences pour 
le langage ou la valeur par défaut, utiliser 'default' pour lire le template 
par défaut '')
 last   etemplate       fr      Dernier
 left   etemplate       fr      Gauche
-length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       fr      Longueur pour char+varchar, précision d'entiers: 2, 4, 
8 et flottants: 4, 8
+length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       fr      Longueur pour char+varchar, précision d'entiers: 2, 4, 
8 et flottants: 4, 8
 link   etemplate       fr      Lien
 linklist       etemplate       fr      Liste de liens
-linkstring     etemplate       fr      ChaîneDeLien
+linkstring     etemplate       fr      ChaîneDeLien
 linkto etemplate       fr      LierVers
-load this template into the editor     etemplate       fr      Charger ce 
template dans l'éditeur
+load this template into the editor     etemplate       fr      Charger ce 
template dans l'éditeur
 minute etemplate       fr      Minute
 month  etemplate       fr      Mois
 name   etemplate       fr      Nom
-name of other table where column is a key from etemplate       fr      Nom de 
l'autre table où la colonne est une clé de
-name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       fr      
Nom de l'ensemble phpgw-template (p.e. verdilak): '' = défaut (va lire le 
template dans les préférences, utiliser 'default' pour lire le template par 
défaut '')
-name of table to add   etemplate       fr      Nom de la table à ajouter
-name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       fr      Nom de l'eTemplate, devrait être dans le formulaire 
application.function[.subTemplate]
-need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       fr    
  Doit être unique dans la table et pas un mot SQL réservé, le mieux est de 
préfixer tout avec une abréviation sur 2 caractères du nom de l'application, 
p.e. 'et_'
+name of other table where column is a key from etemplate       fr      Nom de 
l'autre table où la colonne est une clé de
+name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       fr      
Nom de l'ensemble phpgw-template (p.e. verdilak): '' = défaut (va lire le 
template dans les préférences, utiliser 'default' pour lire le template par 
défaut '')
+name of table to add   etemplate       fr      Nom de la table à ajouter
+name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       fr      Nom de l'eTemplate, devrait être dans le formulaire 
application.function[.subTemplate]
+need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       fr    
  Doit être unique dans la table et pas un mot SQL réservé, le mieux est de 
préfixer tout avec une abréviation sur 2 caractères du nom de l'application, 
p.e. 'et_'
 new search     etemplate       fr      Nouvelle recherche
-new table created      etemplate       fr      Nouvelle table créée
+new table created      etemplate       fr      Nouvelle table créée
 newer version '%1' exists !!!  etemplate       fr      La nouvelle version 
'%1' existe !!!
-nextmatch      etemplate       fr      Occurrence trouvée suivante
+nextmatch      etemplate       fr      Occurrence trouvée suivante
 no file        etemplate       fr      Pas de fichier
-no filename given or selected via browse...    etemplate       fr      Pas de 
nom de fichier donné ou sélectionnée avec naviguer...
-nothing found - try again !!!  etemplate       fr      Rien trouvé - essayez 
encore !!!
-nothing matched search criteria !!!    etemplate       fr      Aucune 
occurrence correspondant aux critères de recherche !!!
-nullable       etemplate       fr      Positionnable à zéro
-number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       fr      Nombre 
de colonnes sur lesquelles le champ/cellule devrait s'étendre ou 'tous' pour 
les colonnes qui restent, nom de la classe CSS (pour le tag TD)
-number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
fr      Nombre de lignes/colonnes dans une boîte H/V, remplissage de cellule, 
espacement de cellule
+no filename given or selected via browse...    etemplate       fr      Pas de 
nom de fichier donné ou sélectionnée avec naviguer...
+nothing found - try again !!!  etemplate       fr      Rien trouvé - essayez 
encore !!!
+nothing matched search criteria !!!    etemplate       fr      Aucune 
occurrence correspondant aux critères de recherche !!!
+nullable       etemplate       fr      Positionnable à zéro
+number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       fr      Nombre 
de colonnes sur lesquelles le champ/cellule devrait s'étendre ou 'tous' pour 
les colonnes qui restent, nom de la classe CSS (pour le tag TD)
+number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
fr      Nombre de lignes/colonnes dans une boîte H/V, remplissage de cellule, 
espacement de cellule
 of     etemplate       fr      de
-only an other version found !!!        etemplate       fr      Une seule autre 
version trouvée !!!
-optional note about the link   etemplate       fr      Note optionnelle à 
propos du lien
+only an other version found !!!        etemplate       fr      Une seule autre 
version trouvée !!!
+optional note about the link   etemplate       fr      Note optionnelle à 
propos du lien
 options        etemplate       fr      Options
-overflow       etemplate       fr      Débordement
+overflow       etemplate       fr      Débordement
 padding        etemplate       fr      Remplissage
 please enter table-name first !!!      etemplate       fr      SVP entrez le 
nom de la table d'abord !!!
-pm     etemplate       fr      Après-midi
-precision      etemplate       fr      Précision
-primary key    etemplate       fr      Clé primaire
-primary key for the table, gets automaticaly indexed   etemplate       fr      
Clé primaire pour la table, est automatiquement indexée
+pm     etemplate       fr      Après-midi
+precision      etemplate       fr      Précision
+primary key    etemplate       fr      Clé primaire
+primary key for the table, gets automaticaly indexed   etemplate       fr      
Clé primaire pour la table, est automatiquement indexée
 radiobutton    etemplate       fr      BoutonRadio
 read   etemplate       fr      Lire
-read a list of entries.        etemplate       fr      Lire une liste 
d'entrées.
-read a single entry by passing the id and fieldlist.   etemplate       fr      
Lire une unique entrée en passant l'ID et la liste des champs.
-read etemplate from database (for the keys above)      etemplate       fr      
Lire eTemplate depuis la base de données (pour les clés ci-dessus)
-remove row (can not be undone!!!)      etemplate       fr      Enlever la 
ligne (ne peut PAS être annulé!!!)
-remove this link (not the entry itself)        etemplate       fr      Enlever 
ce lien (pas l'entrée elle-même)
-returns savely, without deleting       etemplate       fr      Revient de 
manière sûre, sans effacer
+read a list of entries.        etemplate       fr      Lire une liste 
d'entrées.
+read a single entry by passing the id and fieldlist.   etemplate       fr      
Lire une unique entrée en passant l'ID et la liste des champs.
+read etemplate from database (for the keys above)      etemplate       fr      
Lire eTemplate depuis la base de données (pour les clés ci-dessus)
+remove row (can not be undone!!!)      etemplate       fr      Enlever la 
ligne (ne peut PAS être annulé!!!)
+remove this link (not the entry itself)        etemplate       fr      Enlever 
ce lien (pas l'entrée elle-même)
+returns savely, without deleting       etemplate       fr      Revient de 
manière sûre, sans effacer
 right  etemplate       fr      Droite
 save   etemplate       fr      Enregistrer
-save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       fr      Enregistrer l'eTemplate sous les clés ci-dessus (nom, 
...), changez-les pour un Sauvegarder-sous
+save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       fr      Enregistrer l'eTemplate sous les clés ci-dessus (nom, 
...), changez-les pour un Sauvegarder-sous
 saves changes to tables_current.inc.php        etemplate       fr      
Enregistrere les changements dans tables_current.inc.php
 scale  etemplate       fr      Balance
 scale for float        etemplate       fr      Balance pour les flottants
 search etemplate       fr      Rechercher
-select a category      etemplate       fr      Choisissez une catégorie
-select a primary contact, to show in the list  etemplate       fr      
Choisissez un contact primaire, à montrer dans la liste
-select access  etemplate       fr      Choisissez l'accès
+select a category      etemplate       fr      Choisissez une catégorie
+select a primary contact, to show in the list  etemplate       fr      
Choisissez un contact primaire, à montrer dans la liste
+select access  etemplate       fr      Choisissez l'accès
 select account etemplate       fr      Choisissez le compte
 select an app first !!!        etemplate       fr      Choisissez une 
application d'abord !!!
 select an app to search in     etemplate       fr      Choisissez une 
application dans laquelle rechercher
 select an application  etemplate       fr      Choisissez une application
-select an application, (*) = uninstalled       etemplate       fr      
Choisissez une application, (*) = non installée
-select an entry to link with   etemplate       fr      Choisissez une entrée 
à lier
+select an application, (*) = uninstalled       etemplate       fr      
Choisissez une application, (*) = non installée
+select an entry to link with   etemplate       fr      Choisissez une entrée à 
lier
 select an table of the application     etemplate       fr      Choisissez une 
table pour l'application
 select application     etemplate       fr      Choisissez une application
-select category        etemplate       fr      Choisissez une catégorie
+select category        etemplate       fr      Choisissez une catégorie
 select country etemplate       fr      Choisissez un pays
 select day     etemplate       fr      Choisissez un jour
-select if content of field should not be translated (label gets always 
translated)     etemplate       fr      Choisissez si le contenu du champ ne 
devrait pas être traduit (le label est toujours traduit)
+select if content of field should not be translated (label gets always 
translated)     etemplate       fr      Choisissez si le contenu du champ ne 
devrait pas être traduit (le label est toujours traduit)
 select month   etemplate       fr      Choisissez un mois
-select number  etemplate       fr      Choisissez un numéro
+select number  etemplate       fr      Choisissez un numéro
 select one ... etemplate       fr      CHoisissez un ...
 select percentage      etemplate       fr      Choisissez un pourcentage
-select priority        etemplate       fr      Choisissez une priorité
-select state   etemplate       fr      Choisissez un état
+select priority        etemplate       fr      Choisissez une priorité
+select state   etemplate       fr      Choisissez un état
 select this etemplate to delete it     etemplate       fr      Choisissez cet 
eTemplate pour l'effacer
-select year    etemplate       fr      Choisissez l'année
-selectbox      etemplate       fr      Boîte de sélection
-sets today as date     etemplate       fr      Règle aujourd'hui comme date
+select year    etemplate       fr      Choisissez l'année
+selectbox      etemplate       fr      Boîte de sélection
+sets today as date     etemplate       fr      Règle aujourd'hui comme date
 show   etemplate       fr      Montrer
 show (no save) etemplate       fr      Montrer (pas de sauvegarde)
 show values    etemplate       fr      Montrer les valeurs
 showing        etemplate       fr      montre
-shows / allows you to enter values into the etemplate for testing      
etemplate       fr      vous montre / autorise à entrer des valeurs dans 
l'eTemplate pour tester
+shows / allows you to enter values into the etemplate for testing      
etemplate       fr      vous montre / autorise à entrer des valeurs dans 
l'eTemplate pour tester
 shows/displays etemplate for testing, does not save it before  etemplate       
fr      montre/affiche l'eTemplate pour tester, ne l'enregistre pas avant
 spacing        etemplate       fr      Espacement
 span, class    etemplate       fr      Envergure, Classe
 stack  etemplate       fr      Pile
-start a new search, cancel this link   etemplate       fr      Démarre une 
nouvelle recherche, annule ce lien
-start new search for the above pattern etemplate       fr      Démarre une 
nouvelle recherche pour la chaîne de caractères ci-dessus
+start a new search, cancel this link   etemplate       fr      Démarre une 
nouvelle recherche, annule ce lien
+start new search for the above pattern etemplate       fr      Démarre une 
nouvelle recherche pour la chaîne de caractères ci-dessus
 submitbutton   etemplate       fr      BoutonSoumettre
-table unchanged, no write necessary !!!        etemplate       fr      Table 
non modifiée, aucune écriture nécessaire !!!
+table unchanged, no write necessary !!!        etemplate       fr      Table 
non modifiée, aucune écriture nécessaire !!!
 tablename      etemplate       fr      NomTable
 tabs   etemplate       fr      Tabs
 template       etemplate       fr      Template
-template deleted       etemplate       fr      Template effacé
-template saved etemplate       fr      Template enregistré
+template deleted       etemplate       fr      Template effacé
+template saved etemplate       fr      Template enregistré
 text   etemplate       fr      Texte
 textarea       etemplate       fr      ChampTexte
-this text gets displayed if the input-field is empty and has no focus (blur)   
etemplate       fr      Ce texte est affiché si le champ d'entrée est vide et 
n'a pas le curseur (brouillé)
+this text gets displayed if the input-field is empty and has no focus (blur)   
etemplate       fr      Ce texte est affiché si le champ d'entrée est vide et 
n'a pas le curseur (brouillé)
 time   etemplate       fr      Heure
-to start the db-tools  etemplate       fr      Pour démarrer les outils base 
de données
-to start the etemplate editor  etemplate       fr      Pour démarrer 
l'éditeur d'eTemplate
-to start the search    etemplate       fr      Pour démarrer la recherche
+to start the db-tools  etemplate       fr      Pour démarrer les outils base 
de données
+to start the etemplate editor  etemplate       fr      Pour démarrer l'éditeur 
d'eTemplate
+to start the search    etemplate       fr      Pour démarrer la recherche
 today  etemplate       fr      Aujourd'hui
 type   etemplate       fr      Type
 type of the column     etemplate       fr      Type de la colonne
-type of the field (select label if field should be empty)      etemplate       
fr      Type du champ (choisissez le label si le champ devrait être vide)
+type of the field (select label if field should be empty)      etemplate       
fr      Type du champ (choisissez le label si le champ devrait être vide)
 unique etemplate       fr      Unique
-unlink etemplate       fr      Délier
-update a single entry by passing the fields.   etemplate       fr      Mettre 
à jour une unique entrée en passant les champs.
-update from version '%s' to    etemplate       fr      Mettre à jour depuis 
la Version '%s' vers
+unlink etemplate       fr      Délier
+update a single entry by passing the fields.   etemplate       fr      Mettre 
à jour une unique entrée en passant les champs.
+update from version '%s' to    etemplate       fr      Mettre à jour depuis la 
Version '%s' vers
 upload etemplate       fr      Uploader
 value  etemplate       fr      Valeur
-vbox   etemplate       fr      BoîteV
+vbox   etemplate       fr      BoîteV
 version        etemplate       fr      Version
-version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       fr      Numéro 
de version, devrait être de la forme: majeur.mineur.revision.nombre (p.e. 
0.9.13.001 tous les nombres remplis avec des zéros)
-view this linked entry in its application      etemplate       fr      Voir 
cette entrée liée dans son application
-what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       fr      ce qui se passe avec un contenu 
débordant: visible (défaut), caché, scroll, auto (le navigateur décide)
+version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       fr      Numéro 
de version, devrait être de la forme: majeur.mineur.revision.nombre (p.e. 
0.9.13.001 tous les nombres remplis avec des zéros)
+view this linked entry in its application      etemplate       fr      Voir 
cette entrée liée dans son application
+what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       fr      ce qui se passe avec un contenu 
débordant: visible (défaut), caché, scroll, auto (le navigateur décide)
 width  etemplate       fr      Largeur
-width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       fr 
     Largeur de la colonne (en % ou pixels), désactiver col: [! = 
pas]<valeur>[=<verifier>] p.e.: 'address@hidden' désactive la colonne  si le 
contenu de donnees est vide
+width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       fr 
     Largeur de la colonne (en % ou pixels), désactiver col: [! = 
pas]<valeur>[=<verifier>] p.e.: 'address@hidden' désactive la colonne  si le 
contenu de donnees est vide
 width of the table in % or pixels for the table-tag and (optional) div 
etemplate       fr      Largeur de la table en % ou pixels, pour le tag de la 
table et div (optionnel)
-width, disabled        etemplate       fr      Largeur, désactivé
+width, disabled        etemplate       fr      Largeur, désactivé
 write <app>/setup/tables_current.inc.php       etemplate       fr      Ecrire 
<app>/setup/tables_current.inc.php
 write langfile etemplate       fr      Ecrire le fichier de langage
 write tables   etemplate       fr      Ecrire les tables
-writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       fr      Ecrit un fichier 'etemplates.inc.php' 
(pour l'application dans le nom) dans le répertoire setup de l'application
-xml-file to import     etemplate       fr      Fichier XML à importer
+writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       fr      Ecrit un fichier 'etemplates.inc.php' 
(pour l'application dans le nom) dans le répertoire setup de l'application
+xml-file to import     etemplate       fr      Fichier XML à importer
 xslt template  etemplate       fr      Template XSLT
-year   etemplate       fr      Année
+year   etemplate       fr      Année

Index: setup/phpgw_tr.lang
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/phpgw_tr.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_tr.lang 22 Feb 2006 09:36:57 -0000      1.3
+++ setup/phpgw_tr.lang 10 Feb 2007 16:03:46 -0000      1.4
@@ -1,270 +1,270 @@
-%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       tr      %1 (%2 new) Başvuru için yazılmış mesajlar '%3' ve 
 '%4'
-%1 etemplates deleted  etemplate       tr      %1 eŞablonlar silindi
-%1 etemplates for application '%2' dumped to '%3'      etemplate       tr      
%1 Başvuru için eŞablonlar'%2' atıldı '%3'
-%1 etemplates found    etemplate       tr      %1 eŞablonlar bulundu
-%1 matches on search criteria  etemplate       tr      %1 arama kriteri 
üzerinde eşleşmeler
-%1 new etemplates imported for application '%2'        etemplate       tr      
%1 yeni eŞablonlar başvuru için alındı '%2'
-%s disabled    etemplate       tr      %s kapalı
+%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       tr      %1 (%2 new) Baþvuru için yazýlmýþ mesajlar '%3' ve  '%4'
+%1 etemplates deleted  etemplate       tr      %1 eÞablonlar silindi
+%1 etemplates for application '%2' dumped to '%3'      etemplate       tr      
%1 Baþvuru için eÞablonlar'%2' atýldý '%3'
+%1 etemplates found    etemplate       tr      %1 eÞablonlar bulundu
+%1 matches on search criteria  etemplate       tr      %1 arama kriteri 
üzerinde eþleþmeler
+%1 new etemplates imported for application '%2'        etemplate       tr      
%1 yeni eÞablonlar baþvuru için alýndý '%2'
+%s disabled    etemplate       tr      %s kapalý
 %s needed      etemplate       tr      %s gerekli
-%s notranslation       etemplate       tr      %s çeviri yok
-%s onchange    etemplate       tr      %s değişiklik üzerinde
+%s notranslation       etemplate       tr      %s çeviri yok
+%s onchange    etemplate       tr      %s deðiþiklik üzerinde
 %s readonly    etemplate       tr      %s sadece okunabilir
-a pattern to be searched for   etemplate       tr      yeni bir kolon eklemek 
için bir örnek araştırılır(varolanlardan sonra)    etemplate       tr     
 yeni bir kolon ekle (varolan bir taneden sonra)
+a pattern to be searched for   etemplate       tr      yeni bir kolon eklemek 
için bir örnek araþtýrýlýr(varolanlardan sonra)  etemplate       tr      yeni 
bir kolon ekle (varolan bir taneden sonra)
 add column     etemplate       tr      kolon ekle
 add table      etemplate       tr      tablo ekle
-align  etemplate       tr      sıraya sok
-alignment of label and input-field in table-cell       etemplate       tr      
tablo hücresi içindeki giriş alanı ve etiketin sıralanışı
-alignment of the v/hbox containing table-cell  etemplate       tr      tablo 
hücresini içeren V/HBox ın sıralanışı
-am     etemplate       tr      öğleden önce
-an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       tr      numaralandırılmış kolon bu kolonu 
kullanarak sorguyu hızlandırır (disk üzerinde boşluğa neden olur !!!)
-application    etemplate       tr      başvuru
-application name needed to write a langfile or dump the etemplates !!! 
etemplate       tr      bir dil dosyası yazmak veya eŞablonları boşaltmak 
için bir başvuru ismi gerekliydi !!!
+align  etemplate       tr      sýraya sok
+alignment of label and input-field in table-cell       etemplate       tr      
tablo hücresi içindeki giriþ alaný ve etiketin sýralanýþý
+alignment of the v/hbox containing table-cell  etemplate       tr      tablo 
hücresini içeren V/HBox ýn sýralanýþý
+am     etemplate       tr      öðleden önce
+an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       tr      numaralandýrýlmýþ kolon bu kolonu kullanarak 
sorguyu hýzlandýrýr (disk üzerinde boþluða neden olur !!!)
+application    etemplate       tr      baþvuru
+application name needed to write a langfile or dump the etemplates !!! 
etemplate       tr      bir dil dosyasý yazmak veya eÞablonlarý boþaltmak için 
bir baþvuru ismi gerekliydi !!!
 attach etemplate       tr      ekle
 attach file    etemplate       tr      dosya ekle
-blurtext       etemplate       en      bulanık yazı
-border etemplate       tr      sınır
-border-line-thickness for the table-tag        etemplate       tr      tablo 
etiketi için sınır çizgi kalınlığı
-can have special sql-value null        etemplate       tr      özel bir SQL 
değeri olan NULL alınabilir
+blurtext       etemplate       en      bulanýk yazý
+border etemplate       tr      sýnýr
+border-line-thickness for the table-tag        etemplate       tr      tablo 
etiketi için sýnýr çizgi kalýnlýðý
+can have special sql-value null        etemplate       tr      özel bir SQL 
deðeri olan NULL alýnabilir
 cancel etemplate       en      iptal
 category       etemplate       en      kategori
-cellpadding for the table-tag  etemplate       tr      tablo etiketi için 
hücre dolgusu
-cells  etemplate       tr      hücreler
-cellspacing for the table-tag  etemplate       tr      tablo etiketi için 
hücre boşluğu
+cellpadding for the table-tag  etemplate       tr      tablo etiketi için 
hücre dolgusu
+cells  etemplate       tr      hücreler
+cellspacing for the table-tag  etemplate       tr      tablo etiketi için 
hücre boþluðu
 center etemplate       tr      merkez
-check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       tr      içeriğin sadece 
görüntülenebildiğini ancak değiştirilemediğini kontrol et (içerik daha 
sonra geri gönderilmez!)
-check if field has to be filled by user        etemplate       tr      alanın 
kullanıcı tarafından doldurulup doldurulmadığını kontrol et
+check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       tr      içeriðin sadece görüntülenebildiðini 
ancak deðiþtirilemediðini kontrol et (içerik daha sonra geri gönderilmez!)
+check if field has to be filled by user        etemplate       tr      alanýn 
kullanýcý tarafýndan doldurulup doldurulmadýðýný kontrol et
 checkbox       etemplate       tr      kontrol kutusu  
-class  etemplate       tr      sınıf
-class, valign  etemplate       tr      sınıf, dikey hizalama
-click here to attach the file  etemplate       tr      bir dosya eklemek için 
buraya tıkla
-click here to create the link  etemplate       tr      bir link oluşturmak 
için buraya tıkla
-click here to start the search etemplate       tr      aramayı başlatmak 
için buraya tıklayın
-click here to upload the file  etemplate       tr      dosyayı yüklemek 
için buraya tıklayın
+class  etemplate       tr      sýnýf
+class, valign  etemplate       tr      sýnýf, dikey hizalama
+click here to attach the file  etemplate       tr      bir dosya eklemek için 
buraya týkla
+click here to create the link  etemplate       tr      bir link oluþturmak 
için buraya týkla
+click here to start the search etemplate       tr      aramayý baþlatmak için 
buraya týklayýn
+click here to upload the file  etemplate       tr      dosyayý yüklemek için 
buraya týklayýn
 columnname     etemplate       tr      kolon ismi
 comment        etemplate       tr      yorum
-create a new table for the application etemplate       tr      başvuru içn 
yeni bir tablo oluştur
-creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       tr      etiket ve yardım yazılarından İngilizce 
dil dosyası oluştur (adla başvuru için)
-css class for the table-tag    etemplate       tr      tablo etiketi için CSS 
sınıfı
+create a new table for the application etemplate       tr      baþvuru içn 
yeni bir tablo oluþtur
+creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       tr      etiket ve yardým yazýlarýndan Ýngilizce dil 
dosyasý oluþtur (adla baþvuru için)
+css class for the table-tag    etemplate       tr      tablo etiketi için CSS 
sýnýfý
 css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = 
alternating nm row, 'nmr0'+'nmr1' nm rows       etemplate       tr      
CSS-class name for this row, preset: 'nmh' = NextMatch header, 'nmr' = 
alternating NM row, 'nmr0'+'nmr1' NM rows
 css-styles     etemplate       tr      CSS sitilleri
 date+time      etemplate       en      Tarih+Zaman
 datum  etemplate       tr      Veri
-day    etemplate       tr      Gün
-db ensures that every row has a unique value in that column    etemplate       
tr      DB bu sütundaki her satırın eşsiz bir değeri olduğunu temin eder
-db-tools       etemplate               DB-Araçlar
+day    etemplate       tr      Gün
+db ensures that every row has a unique value in that column    etemplate       
tr      DB bu sütundaki her satýrýn eþsiz bir deðeri olduðunu temin eder
+db-tools       etemplate               DB-Araçlar
 deck   etemplate       tr      Deste (harici)
-default        etemplate       tr      Varsayılan
+default        etemplate       tr      Varsayýlan
 delete etemplate       tr      Sil
-delete a single entry by passing the id.       etemplate       tr      ID yi 
geçerek tek bir girişi sil.
+delete a single entry by passing the id.       etemplate       tr      ID yi 
geçerek tek bir giriþi sil.
 delete all selected etemplates, without further inquiry        etemplate       
tr
-       bütün seçilmiş eŞablonları uzak sorgusuz sil
-delete column  etemplate       tr      Sütunu Sil
-delete this etemplate  etemplate       tr      bu eŞablonu sil
-delete whole column (can not be undone!!!)     etemplate       tr      bütün 
kolonu sil (geri alınamaz!!!)
-deletes the above spez. etemplate from the database, can not be undone 
etemplate       tr      yukarıdaki spez i sil. Database deb eŞablon açılamaz
-deletes the etemplate spez. above      etemplate       tr      yukarıdaki 
eŞablon spez ini sil
-deletes this column    etemplate       tr      Bu sütunu sil
-discard changes        etemplate       tr      değişiklikleri iptal et
-displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       tr      girişin 
karşısında gösterilir veya etikette ‘%s’ için giriş yerleştirilir 
(kabul butonu veya görüntü dosya isminin etiketi)
-displayed in statusline of browser if input-field gets focus   etemplate       
tr      giriş alanı odaklanırsa tarayıcının durum çizgisinde gösterilir
-do you want to save the changes you made in table %s?  etemplate       tr      
Tabloda yaptığınız değişiklikleri kaydetmek istermisiniz?
-drop a table - this can not be undone  etemplate       tr      Bir tablo 
taşı-Bu yapılamaz
-drop table     etemplate       tr      Tablo taşı
+       bütün seçilmiþ eÞablonlarý uzak sorgusuz sil
+delete column  etemplate       tr      Sütunu Sil
+delete this etemplate  etemplate       tr      bu eÞablonu sil
+delete whole column (can not be undone!!!)     etemplate       tr      bütün 
kolonu sil (geri alýnamaz!!!)
+deletes the above spez. etemplate from the database, can not be undone 
etemplate       tr      yukarýdaki spez i sil. Database deb eÞablon açýlamaz
+deletes the etemplate spez. above      etemplate       tr      yukarýdaki 
eÞablon spez ini sil
+deletes this column    etemplate       tr      Bu sütunu sil
+discard changes        etemplate       tr      deðiþiklikleri iptal et
+displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       tr      giriþin 
karþýsýnda gösterilir veya etikette ‘%s’ için giriþ yerleþtirilir (kabul butonu 
veya görüntü dosya isminin etiketi)
+displayed in statusline of browser if input-field gets focus   etemplate       
tr      giriþ alaný odaklanýrsa tarayýcýnýn durum çizgisinde gösterilir
+do you want to save the changes you made in table %s?  etemplate       tr      
Tabloda yaptýðýnýz deðiþiklikleri kaydetmek istermisiniz?
+drop a table - this can not be undone  etemplate       tr      Bir tablo 
taþý-Bu yapýlamaz
+drop table     etemplate       tr      Tablo taþý
 dump4setup     etemplate       tr      Dump4Kurulumu
 edit   etemplate       tr      Yaz
-edit the etemplate spez. above etemplate       tr      eŞablon spez ini yaz 
eTemplate spez. above
-editable templates - db-tools  etemplate       tr      Yazılabilir 
Şablonlar-DB araçları
-editable templates - delete template   etemplate       tr      Yazılabilir 
Şablonlar-Şablonu Sil
-editable templates - editor    etemplate       tr      Yazılabilir 
Şablonlar-Editör
-editable templates - search    etemplate       tr      Yazılabilir 
Şablonlar-Arama
-editable templates - show template     etemplate       tr      Yazılabilir 
Şablonlar-Şablonu Göster
-embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       tr      embeded CSS styles, eg. '.red { background: red; }' 
(note the '.' before the class-name) or '@import url(...)' (sınıf isimleri 
bütün sayfa için global!)
-enable javascript onchange submit      etemplate       tr      JavaScript 
onChange kabulünü aktif et
-enter '' for an empty default, nothing mean no default etemplate       tr      
enter '' bir boş varsayılan için, yok varsayılan yok anlamındadır
+edit the etemplate spez. above etemplate       tr      eÞablon spez ini yaz 
eTemplate spez. above
+editable templates - db-tools  etemplate       tr      Yazýlabilir 
Þablonlar-DB araçlarý
+editable templates - delete template   etemplate       tr      Yazýlabilir 
Þablonlar-Þablonu Sil
+editable templates - editor    etemplate       tr      Yazýlabilir 
Þablonlar-Editör
+editable templates - search    etemplate       tr      Yazýlabilir 
Þablonlar-Arama
+editable templates - show template     etemplate       tr      Yazýlabilir 
Þablonlar-Þablonu Göster
+embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       tr      embeded CSS styles, eg. '.red { background: red; }' 
(note the '.' before the class-name) or '@import url(...)' (sýnýf isimleri 
bütün sayfa için global!)
+enable javascript onchange submit      etemplate       tr      JavaScript 
onChange kabulünü aktif et
+enter '' for an empty default, nothing mean no default etemplate       tr      
enter '' bir boþ varsayýlan için, yok varsayýlan yok anlamýndadýr
 enter a search pattern etemplate       tr      Bir arama kriteri gir
-enter filename to upload and attach, use [browse...] to search for it  
etemplate       tr      Eklemek ve yüklemek için bir dosya ismi gir, aramak 
için göz at tuşunu kullan
-enter the new version number here (> old_version), empty for no update-file    
etemplate       tr      buraya yeni versiyon numarasını gir(>eski 
versiyon),olmayan güncelleme dosyası için boş bırak
-enter the new version number here (has to be > old_version)    etemplate       
tr      buraya yeni versiyon numarasını gir(eski versiyondan büyük olmalı)
-entry saved    etemplate       tr      Giriş kaydedildi
-error: template not found !!!  etemplate       tr      Hata:Şablon 
bulunamadı !!!
-error: webserver is not allowed to write into '%1' !!! etemplate       tr      
Hata:websunucusu ‘%1’ in içine yazmak için izinli değil !!!
+enter filename to upload and attach, use [browse...] to search for it  
etemplate       tr      Eklemek ve yüklemek için bir dosya ismi gir, aramak 
için göz at tuþunu kullan
+enter the new version number here (> old_version), empty for no update-file    
etemplate       tr      buraya yeni versiyon numarasýný gir(>eski 
versiyon),olmayan güncelleme dosyasý için boþ býrak
+enter the new version number here (has to be > old_version)    etemplate       
tr      buraya yeni versiyon numarasýný gir(eski versiyondan büyük olmalý)
+entry saved    etemplate       tr      Giriþ kaydedildi
+error: template not found !!!  etemplate       tr      Hata:Þablon bulunamadý 
!!!
+error: webserver is not allowed to write into '%1' !!! etemplate       tr      
Hata:websunucusu ‘%1’ in içine yazmak için izinli deðil !!!
 error: while saveing !!!       etemplate       tr      Hata:kaydederken !!!
 error: writeing !!!    etemplate       tr      Hata:yazarken !!!
-error: writing file (no write-permission for the webserver) !!!        
etemplate       tr      Hata: dosyaya yazma(web sunucusu için yazma izni yok) 
!!!
-etemplate      common  tr      eŞablon
-etemplate '%1' imported, use save to put it in the database    etemplate       
tr      eŞablon '%1' getirtildi, bu şablonu database e yüklemek için KAYDET 
butonunu kullan
-etemplate '%1' written to '%2' etemplate       tr      eŞablon '%1' '%2'
-ye yazıldı.
-etemplate editor       etemplate       tr      eŞablon Editörü
-exchange this row with the one above   etemplate       tr      bu satırı 
yukarıdaki satır ile takas et.
-exchange this two columns      etemplate       tr      bu iki sütunu 
değiştir
-export the loaded etemplate into a xml-file    etemplate       tr      yüklü 
eŞablonu bir xml dosyasının içine taşı
-export xml     etemplate       tr      XML i taşı
-extensions loaded:     etemplate       tr      İlaveler yüklendi:
+error: writing file (no write-permission for the webserver) !!!        
etemplate       tr      Hata: dosyaya yazma(web sunucusu için yazma izni yok) 
!!!
+etemplate      common  tr      eÞablon
+etemplate '%1' imported, use save to put it in the database    etemplate       
tr      eÞablon '%1' getirtildi, bu þablonu database e yüklemek için KAYDET 
butonunu kullan
+etemplate '%1' written to '%2' etemplate       tr      eÞablon '%1' '%2'
+ye yazýldý.
+etemplate editor       etemplate       tr      eÞablon Editörü
+exchange this row with the one above   etemplate       tr      bu satýrý 
yukarýdaki satýr ile takas et.
+exchange this two columns      etemplate       tr      bu iki sütunu deðiþtir
+export the loaded etemplate into a xml-file    etemplate       tr      yüklü 
eÞablonu bir xml dosyasýnýn içine taþý
+export xml     etemplate       tr      XML i taþý
+extensions loaded:     etemplate       tr      Ýlaveler yüklendi:
 file   etemplate       tr      Dosya
-file contains more than one etemplate, last one is shown !!!   etemplate       
tr      Dosya birden fazla eŞablon içeriyor ve sonuncusu görüntüleniyor!!!
-file writen    etemplate       tr      Dosya yazıldı
-fileupload     etemplate       tr      Dosya yüklendi
-first  etemplate       tr      Ä°lk
-floating point etemplate       tr      Değişken nokta
-foreign key    etemplate       tr      Yabancı anahtar
-go to the first entry  etemplate       tr      ilk girişe git
-go to the last entry   etemplate       tr      son girişe git
-go to the next page of entries etemplate       tr      girişlerin son 
sayfasına git
-go to the previous page of entries     etemplate       tr      girişlerin bir 
önceki sayfasına git
+file contains more than one etemplate, last one is shown !!!   etemplate       
tr      Dosya birden fazla eÞablon içeriyor ve sonuncusu görüntüleniyor!!!
+file writen    etemplate       tr      Dosya yazýldý
+fileupload     etemplate       tr      Dosya yüklendi
+first  etemplate       tr      Ýlk
+floating point etemplate       tr      Deðiþken nokta
+foreign key    etemplate       tr      Yabancý anahtar
+go to the first entry  etemplate       tr      ilk giriþe git
+go to the last entry   etemplate       tr      son giriþe git
+go to the next page of entries etemplate       tr      giriþlerin son 
sayfasýna git
+go to the previous page of entries     etemplate       tr      giriþlerin bir 
önceki sayfasýna git
 hbox   etemplate       tr      HKutusu
-height etemplate       tr      Yükseklik
+height etemplate       tr      Yükseklik
 height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       en  
    height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty
-height of the table in % or pixels for the table-tag and (optional) div        
etemplate       tr      Tablo etiketi veya bölümleri için tablonun % veya 
piksel olarak yüksekliği
-height, disabled       etemplate       tr      Yükseklik,Aktif değil
-help   etemplate       tr      Yardım
+height of the table in % or pixels for the table-tag and (optional) div        
etemplate       tr      Tablo etiketi veya bölümleri için tablonun % veya 
piksel olarak yüksekliði
+height, disabled       etemplate       tr      Yükseklik,Aktif deðil
+help   etemplate       tr      Yardým
 horizontal rule        etemplate       tr      Yatay Cetvel
 hour   etemplate       tr      Saat
 html   etemplate       tr      Html
-if field is disabled an empty table-cell is displayed, for (temporal) 
removement of a field/cell       etemplate       tr      eğer alan aktif 
değilse boş bir tablo hücresi görünür
+if field is disabled an empty table-cell is displayed, for (temporal) 
removement of a field/cell       etemplate       tr      eðer alan aktif 
deðilse boþ bir tablo hücresi görünür
 image  etemplate       tr      Resim
-import etemplate       tr      Taşı
-import an etemplate from a xml-file    etemplate       tr      xml 
dosyasından bir eŞablon taşı
-import table-definitions from existing db-table        etemplate       tr      
varolan db tablosundan tablo tanımları taşı
-import xml     etemplate       tr      XML taşı
-index/name of returned content (name of the template, link / method for image) 
etemplate       tr      dönen değerin indeksi veya değeri (Şablonun adı, 
Bağlantı / Resim için yöntem)
-indexed        etemplate       tr      Numaralandırılmış
-insert new column behind this one      etemplate       tr      bu sütunun 
arkasına yeni bir kolon ekle
-insert new column in front of all      etemplate       tr      bütün 
sütunların karşısına yeni bir sütun ekle
-insert new row after this one  etemplate       tr      bu satırdan sonra yeni 
bir satır ekle
-insert new row in front of first line  etemplate       tr      ilk satırın 
karşısına yeni bir sütun ekle
-integer        etemplate       tr      Tamsayı
+import etemplate       tr      Taþý
+import an etemplate from a xml-file    etemplate       tr      xml dosyasýndan 
bir eÞablon taþý
+import table-definitions from existing db-table        etemplate       tr      
varolan db tablosundan tablo tanýmlarý taþý
+import xml     etemplate       tr      XML taþý
+index/name of returned content (name of the template, link / method for image) 
etemplate       tr      dönen deðerin indeksi veya deðeri (Þablonun adý, 
Baðlantý / Resim için yöntem)
+indexed        etemplate       tr      Numaralandýrýlmýþ
+insert new column behind this one      etemplate       tr      bu sütunun 
arkasýna yeni bir kolon ekle
+insert new column in front of all      etemplate       tr      bütün 
sütunlarýn karþýsýna yeni bir sütun ekle
+insert new row after this one  etemplate       tr      bu satýrdan sonra yeni 
bir satýr ekle
+insert new row in front of first line  etemplate       tr      ilk satýrýn 
karþýsýna yeni bir sütun ekle
+integer        etemplate       tr      Tamsayý
 key    etemplate       tr      Anahtar
 label  etemplate       tr      Etiket
 label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] 
t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] 
select:[multiselect] date:[values: eg. 'y-m-d']    etemplate       tr      
Label:[bold][italic] Text:[len][,max] Numbers:[min][,[max][,len]] 
T.area:[rows][,cols] Radiob.:value H.Rule:[width] Templ.:[IndexInContent] 
Select:[multiselect] Date:[values: eg. 'Y-m-d']
 lang   etemplate       tr      Dil
-language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       tr      bağımlı dil şablonu için dil 
kısaltması (örneğin İngilizce için 'en') 
+language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       tr      baðýmlý dil þablonu için dil 
kýsaltmasý (örneðin Ýngilizce için 'en') 
 last   etemplate       tr      Son
 left   etemplate       tr      Sol
-length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       tr      char+varchar için uzunluk, tamsayı: 2, 4, 8 ve 
değişken: 4, 8
-link   etemplate       tr      Bağlantı
-linklist       etemplate       tr      Bağlantı listesi
-linkstring     etemplate       tr      Bağlantı sırası
-linkto etemplate       tr      E bağlantı
-load this template into the editor     etemplate       tr      bu şablonu 
editöre yükle
+length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       tr      char+varchar için uzunluk, tamsayý: 2, 4, 8 ve 
deðiþken: 4, 8
+link   etemplate       tr      Baðlantý
+linklist       etemplate       tr      Baðlantý listesi
+linkstring     etemplate       tr      Baðlantý sýrasý
+linkto etemplate       tr      E baðlantý
+load this template into the editor     etemplate       tr      bu þablonu 
editöre yükle
 minute etemplate       tr      Dakika
 month  etemplate       tr      Ay
-name   etemplate       tr      Ä°sim
-name of other table where column is a key from etemplate       tr      kolonun 
anahtar olduğu yerdeki diğer tablonun ismi
-name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       tr      
phpgw  şablon ayarının ismi (örneğin verdilak): '' = varsayılan 
(özellikler şablonunu okuyacak, 'varsayılan' varsayılan şablonu okumak 
için '')
-name of table to add   etemplate       tr      Ekleme yapmak için kullanılan 
tablonun ismi
-name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       tr      eŞablonun ismi uygulama.fonksiyon[.altŞablon] 
şeklinde olabilir
-need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       tr    
  tabloda eşinin olmaması gerekir ve SQL de rezerve edilmiş kelimelerden 
olmamalıdır search  etemplate       tr      Yeni arama
-new table created      etemplate       tr      Yeni tablo oluşturuldu
+name   etemplate       tr      Ýsim
+name of other table where column is a key from etemplate       tr      kolonun 
anahtar olduðu yerdeki diðer tablonun ismi
+name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       tr      
phpgw  þablon ayarýnýn ismi (örneðin verdilak): '' = varsayýlan (özellikler 
þablonunu okuyacak, 'varsayýlan' varsayýlan þablonu okumak için '')
+name of table to add   etemplate       tr      Ekleme yapmak için kullanýlan 
tablonun ismi
+name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       tr      eÞablonun ismi uygulama.fonksiyon[.altÞablon] þeklinde 
olabilir
+need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       tr    
  tabloda eþinin olmamasý gerekir ve SQL de rezerve edilmiþ kelimelerden 
olmamalýdýr search       etemplate       tr      Yeni arama
+new table created      etemplate       tr      Yeni tablo oluþturuldu
 newer version '%1' exists !!!  etemplate       tr      en yeni versiyon '%1' 
gerekli!!!
-nextmatch      etemplate       tr      Sonraki eşleşme
+nextmatch      etemplate       tr      Sonraki eþleþme
 no file        etemplate       tr      dosya yok
-no filename given or selected via browse...    etemplate       tr      
herhangi bir dosya ismi verilmedi yada tarayıcı üzerinden seçilmedi...
-nothing found - try again !!!  etemplate       tr      Hiçbirşey 
bulunamadı- tekrar deneyin !!!
-nothing matched search criteria !!!    etemplate       tr      Aranan kriter 
için bir eşleşme bulunamadı !!!
+no filename given or selected via browse...    etemplate       tr      
herhangi bir dosya ismi verilmedi yada tarayýcý üzerinden seçilmedi...
+nothing found - try again !!!  etemplate       tr      Hiçbirþey bulunamadý- 
tekrar deneyin !!!
+nothing matched search criteria !!!    etemplate       tr      Aranan kriter 
için bir eþleþme bulunamadý !!!
 nullable       etemplate       tr      Nullable
-number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       tr      
Sütunların sayısı alan yada hücrelere yayılabilir veya kalan sütunlar 
için ‘hepsi’ kullanılabilir, CSS-sınıf ismi(TD etiketi için)
-number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
tr      V/HBox daki sütun ve satırların sayısı, Hücre doldurma, Hücre 
boşluğu
+number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       tr      
Sütunlarýn sayýsý alan yada hücrelere yayýlabilir veya kalan sütunlar için 
‘hepsi’ kullanýlabilir, CSS-sýnýf ismi(TD etiketi için)
+number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
tr      V/HBox daki sütun ve satýrlarýn sayýsý, Hücre doldurma, Hücre boþluðu
 of     etemplate       tr      in
-only an other version found !!!        etemplate       tr      sadece diğer 
versiyon bulundu !!!
-optional note about the link   etemplate       tr      bağlantı hakkında 
isteğe bağlı not
-options        etemplate       tr      Seçenekler
-overflow       etemplate       tr      Taşma
+only an other version found !!!        etemplate       tr      sadece diðer 
versiyon bulundu !!!
+optional note about the link   etemplate       tr      baðlantý hakkýnda 
isteðe baðlý not
+options        etemplate       tr      Seçenekler
+overflow       etemplate       tr      Taþma
 padding        etemplate       tr      Doldurma
-please enter table-name first !!!      etemplate       tr      Önce tablo 
ismini girin !!!
-pm     etemplate       tr      öğleden sonra
+please enter table-name first !!!      etemplate       tr      Önce tablo 
ismini girin !!!
+pm     etemplate       tr      öðleden sonra
 precision      etemplate       tr      Kesinlik
 primary key    etemplate       tr      Birincil anahtar
-primary key for the table, gets automaticaly indexed   etemplate       tr      
Tablo için birincil anahtar otomatik olarak numaralandırılır
+primary key for the table, gets automaticaly indexed   etemplate       tr      
Tablo için birincil anahtar otomatik olarak numaralandýrýlýr
 radiobutton    etemplate       tr      Radyo butonu
 read   etemplate       tr      Oku
-read a list of entries.        etemplate       tr      Girişlerin bir 
listesini oku.
-read a single entry by passing the id and fieldlist.   etemplate       tr      
Alan listesi ve id yi geçerek tek bir giriş oku.
-read etemplate from database (for the keys above)      etemplate       tr      
Database den bir şablon oku (yukarıdaki anahtarlar için)
-remove row (can not be undone!!!)      etemplate       tr      sütunu kaldır 
(geri alınamaz !!!)
-remove this link (not the entry itself)        etemplate       tr      Bu 
bağlantıyı kaldır (tek başına girişi değil)
-returns savely, without deleting       etemplate       tr      silinmeden 
güvenli bir şekilde geri döner
-right  etemplate       tr      Sağ
+read a list of entries.        etemplate       tr      Giriþlerin bir 
listesini oku.
+read a single entry by passing the id and fieldlist.   etemplate       tr      
Alan listesi ve id yi geçerek tek bir giriþ oku.
+read etemplate from database (for the keys above)      etemplate       tr      
Database den bir þablon oku (yukarýdaki anahtarlar için)
+remove row (can not be undone!!!)      etemplate       tr      sütunu kaldýr 
(geri alýnamaz !!!)
+remove this link (not the entry itself)        etemplate       tr      Bu 
baðlantýyý kaldýr (tek baþýna giriþi deðil)
+returns savely, without deleting       etemplate       tr      silinmeden 
güvenli bir þekilde geri döner
+right  etemplate       tr      Sað
 save   etemplate       tr      Kaydet
-save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       tr      eŞablonu aşağıdaki anahtarların altına 
kaydet(isim, ...), bunları farklı kaydet için değiştir
-saves changes to tables_current.inc.php        etemplate       tr      
değişiklikleri tables_current.inc.php e kaydet
-scale  etemplate       tr      Ölçü
-scale for float        etemplate       tr      değişken için ölçü
-search etemplate       tr      Araştır
-select a category      etemplate       tr      bir kategori seç
-select a primary contact, to show in the list  etemplate       tr      Listede 
göstermek için birincil bir bağlantı seç
-select access  etemplate       tr      Griş seç
-select account etemplate       tr      Hesap seç
-select an app first !!!        etemplate       tr      İlk önce bir uygulama 
seç !!!
-select an app to search in     etemplate       tr      Araştırmak için bir 
uygulama seç
-select an application  etemplate       tr      Bir uygulama seç
-select an application, (*) = uninstalled       etemplate       tr      Bir 
uygulama seç, (*) = kaldırıldı
-select an entry to link with   etemplate       tr      İle bağlantı kurmak 
için bir bağlantı seç
-select an table of the application     etemplate       tr      Uygulamanın 
tablosunu seç
-select application     etemplate       tr      Uygulama seç
-select category        etemplate       tr      Kategori seç
-select country etemplate       tr      Ülke seç
-select day     etemplate       tr      Gün seç
-select if content of field should not be translated (label gets always 
translated)     etemplate       tr      alanın içeriği çevrilmemişse seç 
(etiketler her zaman çevrilir)
-select month   etemplate       tr      Ay seç
-select number  etemplate       tr      Numara seç
-select one ... etemplate       tr      Bir tane seç...
-select percentage      etemplate       tr      Yüzde seç
-select priority        etemplate       tr      Öncelik seç
-select state   etemplate       tr      Durum seç
-select this etemplate to delete it     etemplate       tr      eŞablonu 
silmek için seç
-select year    etemplate       tr      Yıl seç
-selectbox      etemplate       tr      Kutu seç
-sets today as date     etemplate       tr      bugünü tarih olarak ayarla
-show   etemplate       tr      Göster
-show (no save) etemplate       tr      Göster (katdetmeden)
-show values    etemplate       tr      Değerleri göster
-showing        etemplate       tr      gösterme
-shows / allows you to enter values into the etemplate for testing      
etemplate       tr      sana eŞablona test için değerler girmene izin verir
-shows/displays etemplate for testing, does not save it before  etemplate       
tr      eŞablonu test için göster, önceden kaydetme
-spacing        etemplate       tr      Boşluk
-span, class    etemplate       en      Mesafe, Sınıf
-stack  etemplate       tr      Yığın
-start a new search, cancel this link   etemplate       tr      yeni bir arama 
başlat, bu bağlantıyı iptal et
-start new search for the above pattern etemplate       tr      yukarıdaki 
örnek için yeni bir arama başlat
+save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       tr      eÞablonu aþaðýdaki anahtarlarýn altýna kaydet(isim, 
...), bunlarý farklý kaydet için deðiþtir
+saves changes to tables_current.inc.php        etemplate       tr      
deðiþiklikleri tables_current.inc.php e kaydet
+scale  etemplate       tr      Ölçü
+scale for float        etemplate       tr      deðiþken için ölçü
+search etemplate       tr      Araþtýr
+select a category      etemplate       tr      bir kategori seç
+select a primary contact, to show in the list  etemplate       tr      Listede 
göstermek için birincil bir baðlantý seç
+select access  etemplate       tr      Griþ seç
+select account etemplate       tr      Hesap seç
+select an app first !!!        etemplate       tr      Ýlk önce bir uygulama 
seç !!!
+select an app to search in     etemplate       tr      Araþtýrmak için bir 
uygulama seç
+select an application  etemplate       tr      Bir uygulama seç
+select an application, (*) = uninstalled       etemplate       tr      Bir 
uygulama seç, (*) = kaldýrýldý
+select an entry to link with   etemplate       tr      Ýle baðlantý kurmak 
için bir baðlantý seç
+select an table of the application     etemplate       tr      Uygulamanýn 
tablosunu seç
+select application     etemplate       tr      Uygulama seç
+select category        etemplate       tr      Kategori seç
+select country etemplate       tr      Ülke seç
+select day     etemplate       tr      Gün seç
+select if content of field should not be translated (label gets always 
translated)     etemplate       tr      alanýn içeriði çevrilmemiþse seç 
(etiketler her zaman çevrilir)
+select month   etemplate       tr      Ay seç
+select number  etemplate       tr      Numara seç
+select one ... etemplate       tr      Bir tane seç...
+select percentage      etemplate       tr      Yüzde seç
+select priority        etemplate       tr      Öncelik seç
+select state   etemplate       tr      Durum seç
+select this etemplate to delete it     etemplate       tr      eÞablonu silmek 
için seç
+select year    etemplate       tr      Yýl seç
+selectbox      etemplate       tr      Kutu seç
+sets today as date     etemplate       tr      bugünü tarih olarak ayarla
+show   etemplate       tr      Göster
+show (no save) etemplate       tr      Göster (katdetmeden)
+show values    etemplate       tr      Deðerleri göster
+showing        etemplate       tr      gösterme
+shows / allows you to enter values into the etemplate for testing      
etemplate       tr      sana eÞablona test için deðerler girmene izin verir
+shows/displays etemplate for testing, does not save it before  etemplate       
tr      eÞablonu test için göster, önceden kaydetme
+spacing        etemplate       tr      Boþluk
+span, class    etemplate       en      Mesafe, Sýnýf
+stack  etemplate       tr      Yýðýn
+start a new search, cancel this link   etemplate       tr      yeni bir arama 
baþlat, bu baðlantýyý iptal et
+start new search for the above pattern etemplate       tr      yukarýdaki 
örnek için yeni bir arama baþlat
 submitbutton   etemplate       tr      Kabul butonu
-table unchanged, no write necessary !!!        etemplate       tr      Tablo 
değişmedi, yazmak gerekmiyor !!!
+table unchanged, no write necessary !!!        etemplate       tr      Tablo 
deðiþmedi, yazmak gerekmiyor !!!
 tablename      etemplate       tr      Tablo ismi
 tabs   etemplate       tr      Etiketler
-template       etemplate       tr      Şablon
-template deleted       etemplate       tr      Şablon silindi
-template saved etemplate       tr      Şablon kaydedildi
+template       etemplate       tr      Þablon
+template deleted       etemplate       tr      Þablon silindi
+template saved etemplate       tr      Þablon kaydedildi
 text   etemplate       tr      Metin
-textarea       etemplate       tr      Metin bölümü
-this text gets displayed if the input-field is empty and has no focus (blur)   
etemplate       tr      bu metin eğer giriş alanı boş yada bulanıksa 
görüntülenir
+textarea       etemplate       tr      Metin bölümü
+this text gets displayed if the input-field is empty and has no focus (blur)   
etemplate       tr      bu metin eðer giriþ alaný boþ yada bulanýksa 
görüntülenir
 time   etemplate       tr      Zaman
-to start the db-tools  etemplate       tr      DB-Araçlarına başlamak için
-to start the etemplate editor  etemplate       tr      eŞablon editörüne 
başlamak için
-to start the search    etemplate       tr      aramayı başlatmak için
-today  etemplate       tr      Bugün
+to start the db-tools  etemplate       tr      DB-Araçlarýna baþlamak için
+to start the etemplate editor  etemplate       tr      eÞablon editörüne 
baþlamak için
+to start the search    etemplate       tr      aramayý baþlatmak için
+today  etemplate       tr      Bugün
 type   etemplate       tr      Tip
-type of the column     etemplate       tr      sütunun tipi
-type of the field (select label if field should be empty)      etemplate       
tr      alanın tipi (eğer alan boş olursa etiket seç)
-unique etemplate       tr      Eşsiz
-unlink etemplate       tr      Bağlantısız
-update a single entry by passing the fields.   etemplate       tr      
Alanları geçerek tek bir girişi güncelle.
-update from version '%s' to    etemplate       tr      '%s' versiyonundan –e 
güncelle
-upload etemplate       tr      Yükle
-value  etemplate       tr      Değer
+type of the column     etemplate       tr      sütunun tipi
+type of the field (select label if field should be empty)      etemplate       
tr      alanýn tipi (eðer alan boþ olursa etiket seç)
+unique etemplate       tr      Eþsiz
+unlink etemplate       tr      Baðlantýsýz
+update a single entry by passing the fields.   etemplate       tr      
Alanlarý geçerek tek bir giriþi güncelle.
+update from version '%s' to    etemplate       tr      '%s' versiyonundan –e 
güncelle
+upload etemplate       tr      Yükle
+value  etemplate       tr      Deðer
 vbox   etemplate       tr      VBox
 version        etemplate       tr      Versiyon
-version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       tr      versiyon 
numarası major.minor.revision.number formatında olabilir (örneğin 
0.9.13.001 bütün numaralar sıfırlarla dolduruldu)
-view this linked entry in its application      etemplate       tr      
bağlantılı girişi bu uygulamada göster
-what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       tr      taşma içeriğiyle ne olur: 
görünüm(varsayılan), gizli, kaydırılabilir, otomatik (tarayıcı karar 
verir)
-width  etemplate       tr      Genişlik
-width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       tr 
     sütunun genişliği (in % or pixel), sütunu aktif etme: [! = 
not]<value>[=<check>] eg: 'address@hidden' eğer datanın içeriği boşsa 
sütunu aktif etme
+version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       tr      versiyon 
numarasý major.minor.revision.number formatýnda olabilir (örneðin 0.9.13.001 
bütün numaralar sýfýrlarla dolduruldu)
+view this linked entry in its application      etemplate       tr      
baðlantýlý giriþi bu uygulamada göster
+what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       tr      taþma içeriðiyle ne olur: 
görünüm(varsayýlan), gizli, kaydýrýlabilir, otomatik (tarayýcý karar verir)
+width  etemplate       tr      Geniþlik
+width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       tr 
     sütunun geniþliði (in % or pixel), sütunu aktif etme: [! = 
not]<value>[=<check>] eg: 'address@hidden' eðer datanýn içeriði boþsa sütunu 
aktif etme
 width of the table in % or pixels for the table-tag and (optional) div 
etemplate       tr      Width of the table in % or pixels for the table-tag and 
(optional) div
-width, disabled        etemplate       tr      Genişlik, Kapalı
+width, disabled        etemplate       tr      Geniþlik, Kapalý
 write <app>/setup/tables_current.inc.php       etemplate       en      Write 
<app>/setup/tables_current.inc.php
-write langfile etemplate       tr      Dil dosyasına yaz
+write langfile etemplate       tr      Dil dosyasýna yaz
 write tables   etemplate       tr      Tablolara yaz
-writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       tr      'etemplates.inc.php' adlı dosyaya 
yazar (for application in Name) in the setup-dir of the app
+writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       tr      'etemplates.inc.php' adlý dosyaya 
yazar (for application in Name) in the setup-dir of the app
 xml-file to import     etemplate       tr      xml-dosyaya ekle
-xslt template  etemplate       tr      XSLT Şablonu
-year   etemplate       tr      Yıl
+xslt template  etemplate       tr      XSLT Þablonu
+year   etemplate       tr      Yýl
 

Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/setup.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- setup/setup.inc.php 6 Sep 2006 11:13:30 -0000       1.16
+++ setup/setup.inc.php 10 Feb 2007 16:03:46 -0000      1.17
@@ -1,23 +1,27 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: setup.inc.php,v 1.16 2006/09/06 11:13:30 skwashd Exp $
-*/
+       
/**************************************************************************\
+       * phpGroupWare - Editable Templates                                     
   *
+       * http://www.phpgroupware.org                                           
   *
+       " Written by Ralf Becker <address@hidden>                  *
+       * --------------------------------------------                          
   *
+       *  This program is free software; you can redistribute it and/or modify 
it *
+       *  under the terms of the GNU General Public License as published by 
the   *
+       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
+       *  option) any later version.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id: setup.inc.php,v 1.17 2007/02/10 16:03:46 sigurdne Exp $ */
+
        $setup_info['etemplate']['name']      = 'etemplate';
        $setup_info['etemplate']['version']   = '0.9.15.002';
        $setup_info['etemplate']['app_order'] = 8;      // just behind the 
developers-tools
        $setup_info['etemplate']['tables']    = array('phpgw_etemplate');
        $setup_info['etemplate']['enable']    = 1;
-       $setup_info['etemplate']['app_group']   = 'development';
 
        $setup_info['etemplate']['author'] = 
        $setup_info['etemplate']['maintainer'] = array(
-               'name'  => 'Ralf Becker',
-               'email' => 'address@hidden'
+               'name'  => 'phpGroupWare Coordination Team',
+               'email' => 'address@hidden'
        );
        $setup_info['etemplate']['license']   = 'GPL';
        $setup_info['etemplate']['description'] =
@@ -27,7 +31,7 @@
        $setup_info['etemplate']['note'] =
                'For <b>more information</b> check out the <a 
href="etemplate/doc/etemplate.html" target="_blank">Tutorial</a>, 
                the <a href="etemplate/doc/referenz.html" 
target="_blank">Referenz Documentation</a> 
-               or the <a href="http://www.phpgroupware.org/wiki/etemplate"; 
target="_blank">eTemplate page in our Wiki</a>.';
+               or the <a href="http://docs.phpgroupware.org/wiki/etemplate"; 
target="_blank">eTemplate page in our Wiki</a>.';
 
        /* The hooks this app includes, needed for hooks registration */
        //$setup_info['etemplate']['hooks'][] = 'preferences';
@@ -37,6 +41,6 @@
        /* Dependencies for this app to work */
        $setup_info['etemplate']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('0.9.17', '0.9.18')
+                'versions' => Array('0.9.13','0.9.14','0.9.15','0.9.16')
        );
 ?>

Index: setup/tables_baseline.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/tables_baseline.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- setup/tables_baseline.inc.php       6 Sep 2006 11:13:30 -0000       1.2
+++ setup/tables_baseline.inc.php       10 Feb 2007 16:03:46 -0000      1.3
@@ -1,12 +1,17 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: tables_baseline.inc.php,v 1.2 2006/09/06 11:13:30 skwashd Exp $
-*/
+  /**************************************************************************\
+  * phpGroupWare - Editable Templates                                        *
+  * http://www.phpgroupware.org                                              *
+  " Written by Ralf Becker <address@hidden>                  *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id: tables_baseline.inc.php,v 1.3 2007/02/10 16:03:46 sigurdne Exp $ */
+
        $phpgw_baseline = array(
                'phpgw_etemplate' => array(
                        'fd' => array(

Index: setup/tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/tables_current.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- setup/tables_current.inc.php        6 Sep 2006 11:13:30 -0000       1.5
+++ setup/tables_current.inc.php        10 Feb 2007 16:03:46 -0000      1.6
@@ -1,12 +1,17 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author Ralf Becker <address@hidden>
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: tables_current.inc.php,v 1.5 2006/09/06 11:13:30 skwashd Exp $
-*/
+  /**************************************************************************\
+  * phpGroupWare - Editable Templates                                        *
+  * http://www.phpgroupware.org                                              *
+  " Written by Ralf Becker <address@hidden>                  *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id: tables_current.inc.php,v 1.6 2007/02/10 16:03:46 sigurdne Exp $ */
+
        $phpgw_baseline = array(
                'phpgw_etemplate' => array(
                        'fd' => array(

Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/setup/tables_update.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/tables_update.inc.php 6 Sep 2006 11:13:30 -0000       1.3
+++ setup/tables_update.inc.php 10 Feb 2007 16:03:46 -0000      1.4
@@ -1,13 +1,15 @@
 <?php
-/**
-* eTemplate - basic application development environment
-* @copyright Assuming Copyright (C) 2002-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
-* @author ???
-* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @package etemplate
-* @version $Id: tables_update.inc.php,v 1.3 2006/09/06 11:13:30 skwashd Exp $
-*/
-  /* $Id: tables_update.inc.php,v 1.3 2006/09/06 11:13:30 skwashd Exp $ */
+  /**************************************************************************\
+  * phpGroupWare - Setup                                                     *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id: tables_update.inc.php,v 1.4 2007/02/10 16:03:46 sigurdne Exp $ */
 
        $test[] = '0.9.13.001';
        function etemplate_upgrade0_9_13_001()

Index: templates/base/disable_test.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/disable_test.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/disable_test.xet     20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/disable_test.xet     10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: disable_test.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: disable_test.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.disable_test" template="" lang="" group="" 
version="">
                <columns>

Index: templates/base/editor.cell.vbox.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/editor.cell.vbox.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/editor.cell.vbox.xet 20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/editor.cell.vbox.xet 10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: editor.cell.vbox.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: editor.cell.vbox.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.editor.cell" template="" lang="" group="0" 
version="0.9.15.002" height="100%">
                <columns>

Index: templates/base/editor.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/editor.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/editor.xet   20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/editor.xet   10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: editor.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: editor.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.editor.keys" template="" lang="" group="0" 
version="0.9.13.003">
                <columns>

Index: templates/base/link_widget.attach.xet
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/templates/base/link_widget.attach.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/link_widget.attach.xet       20 Feb 2006 00:03:01 -0000      
1.1
+++ templates/base/link_widget.attach.xet       10 Feb 2007 16:03:46 -0000      
1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: link_widget.attach.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: link_widget.attach.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.link_widget.attach" template="" lang="" group="" 
version="0.9.15.001">
                <columns>

Index: templates/base/link_widget.create.xet
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/templates/base/link_widget.create.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/link_widget.create.xet       20 Feb 2006 00:03:01 -0000      
1.1
+++ templates/base/link_widget.create.xet       10 Feb 2007 16:03:46 -0000      
1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: link_widget.create.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: link_widget.create.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.link_widget.create" template="" lang="" group="" 
version="0.9.15.001">
                <columns>

Index: templates/base/link_widget.list.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/link_widget.list.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/link_widget.list.xet 20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/link_widget.list.xet 10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: link_widget.list.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: link_widget.list.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.link_widget.list" template="" lang="" group="" 
version="0.9.15.002" class="whiteback">
                <columns>

Index: templates/base/link_widget.search.xet
===================================================================
RCS file: 
/sources/phpgroupware/etemplate/templates/base/link_widget.search.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/link_widget.search.xet       20 Feb 2006 00:03:01 -0000      
1.1
+++ templates/base/link_widget.search.xet       10 Feb 2007 16:03:46 -0000      
1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: link_widget.search.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: link_widget.search.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.link_widget.search" template="" lang="" group="" 
version="0.9.15.002">
                <columns>

Index: templates/base/nextmatch_widget.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/nextmatch_widget.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/nextmatch_widget.xet 20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/nextmatch_widget.xet 10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: nextmatch_widget.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: nextmatch_widget.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.nextmatch_widget.nm_row" template="" lang="" 
group="0" version="0.9.15.005" width="100%" spacing="0" padding="5">
                <columns>

Index: templates/base/test.xsl
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/test.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/test.xsl     20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/test.xsl     10 Feb 2007 16:03:46 -0000      1.2
@@ -1,4 +1,4 @@
-<!-- $Id: test.xsl,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: test.xsl,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 
 <xsl:template match="PHPGW">
        <xsl:value-of select="label"/>

Index: templates/base/vbox.test.xet
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/base/vbox.test.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/vbox.test.xet        20 Feb 2006 00:03:01 -0000      1.1
+++ templates/base/vbox.test.xet        10 Feb 2007 16:03:46 -0000      1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: vbox.test.xet,v 1.1 2006/02/20 00:03:01 skwashd Exp $ -->
+<!-- $Id: vbox.test.xet,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ -->
 <overlay>
        <grid id="etemplate.vbox.test" template="" lang="" group="" version="" 
border="1">
                <columns>

Index: templates/idots/images/navbar.png
===================================================================
RCS file: /sources/phpgroupware/etemplate/templates/idots/images/navbar.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsMHjO1C and /tmp/cvsTsDzt1 differ

Index: js/etemplate.js
===================================================================
RCS file: js/etemplate.js
diff -N js/etemplate.js
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ js/etemplate.js     10 Feb 2007 16:03:46 -0000      1.2
@@ -0,0 +1,68 @@
+ /**********************************************************************\
+ * phpGroupWare - eTemplate                                            *
+ * http://www.phpgroupware.org                                         *
+ * This program is part of the GNU project, see http://www.gnu.org/    *
+ *                                                                     *
+ * Copyright 2002, 2003 Free Software Foundation, Inc.                 *
+ *                                                                     *
+ * Originally Written by Ralf Becker - <address@hidden>        *
+ * --------------------------------------------                                
*
+ * This program is Free Software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or   *
+ * at your option) any later version.                                  *
+ \**********************************************************************/
+ /* $Id: etemplate.js,v 1.2 2007/02/10 16:03:46 sigurdne Exp $ */
+
+function set_element(form,name,value)
+{
+       //alert('set_element: '+name+'='+value);
+       for (i = 0; i < form.length; i++)
+       {
+               if (form.elements[i].name == name)
+               {
+                       form.elements[i].value = value;
+               }
+       }
+}
+
+function set_element2(form,name,vname)
+{
+       //alert('set_element2: '+name+'='+vname);
+       for (i = 0; i < form.length; i++)
+       {
+               if (form.elements[i].name == vname)
+               {
+                       value = form.elements[i].value;
+               }
+       }
+       //alert('set_element2: '+name+'='+value);
+       for (i = 0; i < form.length; i++)
+       {
+               if (form.elements[i].name == name)
+               {
+                       form.elements[i].value = value;
+               }
+       }
+}
+
+function activate_tab(tab,all_tabs,name)
+{
+       var tabs = all_tabs.split('|');
+       var parts = tab.split('.');
+       var last_part = parts.length-1;
+       
+       for (n = 0; n < tabs.length; n++)
+       {
+               var t = tabs[n];
+
+               if (t.indexOf('.') < 0 && parts.length > 1) 
+               {
+                       parts[last_part] = t;
+                       t = parts.join('.');
+               }
+               document.getElementById(t).style.visibility = t == tab ? 
'visible' : 'hidden';
+               document.getElementById(t+'-tab').className = 
'etemplate_tab'+(t == tab ? '_active th' : ' row_on');
+       }
+       document.getElementByName(name).value = tab;
+}

Index: setup/phpgw_ja.lang
===================================================================
RCS file: setup/phpgw_ja.lang
diff -N setup/phpgw_ja.lang
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ setup/phpgw_ja.lang 10 Feb 2007 16:03:46 -0000      1.2
@@ -0,0 +1,274 @@
+%1 (%2 new) messages writen for application '%3' and languages '%4'    
etemplate       ja      
%1¡Ê¿·µ¬¡§%2¡Ë¤Î¥á¥Ã¥»¡¼¥¸¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡Ê%3¡Ë¤Î¸À¸ì¡Ê%4¡Ë¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£
+%1 etemplates deleted  etemplate       ja      eTemplate¡Ê%1¡Ë¤òºï½ü¤·¤Þ¤·¤¿
+%1 etemplates for application '%2' dumped to '%3'      etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡Ê%2¡ËÍѤÎ%1¸Ä¤ÎeTemplate¥Ç¡¼¥¿¤ò'%3'¤Ë¥À¥ó¥×Êݸ¤·¤Þ¤·¤¿¡£
+%1 etemplates found    etemplate       ja      eTemplate¡Ê%1¡Ë¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿
+%1 matches on search criteria  etemplate       ja      
¸¡º÷¾ò·ï¤Ç%1·ï°ìÃפ·¤Þ¤¹¡£
+%1 new etemplates imported for application '%2'        etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡Ê%2¡Ë¤Î¿·¤·¤¤eTemplate¡Ê%1¡Ë¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿¡£
+%s disabled    etemplate       ja      %s ̵¸ú
+%s needed      etemplate       ja      %s ɬ¿Ü
+%s notranslation       etemplate       ja      %s ËÝÌõ¤Ê¤·
+%s onchange    etemplate       ja      %s onChange
+%s readonly    etemplate       ja      %s Æɤ߼è¤êÀìÍÑ
+<b>etemplates</b> are a new widget-based template system for phpgroupware with 
an interactive editor and a database table-editor (creates 
tables_current.inc.php and updates automaticaly tables_update.inc.php).      
common  ja      
<b>eTemplates</b>¤Ï¡¢ÂÐÏ÷¿¤Î¥¨¥Ç¥£¥¿¤òÍ­¤¹¤ëphpGroupWareÍѤΥ³¥ó¥Ý¡¼¥Í¥ó¥È¡ÊÉôÉÊ¡Ë¥Ù¡¼¥¹¤Î¥Æ¥ó¥×¥ì¡¼¥È¡¦¥·¥¹¥Æ¥à¤Ç¤¹¡£<b>eTemplates</b>¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Æ¡¼¥Ö¥ë¡¦¥¨¥Ç¥£¥¿¤Ï¡¢phpGroupWareÍѥơ¼¥Ö¥ëÄêµÁ¥Õ¥¡¥¤¥ë¡Êtables_current.inc.php¡¢tables_update.inc.php¡Ë¤ÎºîÀ®¡¢¹¹¿·¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+a pattern to be searched for   etemplate       ja      
¸¡º÷Âоݥƥ­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£
+add a new column (after the existing ones)     etemplate       ja      
´û¸¥Õ¥£¡¼¥ë¥É¤Î¸å¤Ë¿·µ¬¥Õ¥£¡¼¥ë¥É¤òÄɲä·¤Þ¤¹¡£
+add column     etemplate       ja      ¥Õ¥£¡¼¥ë¥ÉÄɲÃ
+add table      etemplate       ja      ¥Æ¡¼¥Ö¥ëÄɲÃ
+align  etemplate       ja      Align
+alignment of label and input-field in table-cell       etemplate       ja      
¥é¥Ù¥ë¤ÈÆþÎÏ¥Õ¥£¡¼¥ë¥É¤Î²£Êý¸þ¤Îɽ¼¨°ÌÃÖ¤ò»ØÄꤷ¤Þ¤¹¡£
+alignment of the v/hbox containing table-cell  etemplate       ja      
table¥»¥ë¤ò´Þ¤ó¤ÀVBox/HBox¤Î²£Êý¸þ¤Îɽ¼¨°ÌÃÖ¤ò»ØÄꤷ¤Þ¤¹¡£
+am     etemplate       ja      AM
+an indexed column speeds up querys using that column (cost space on the disk 
!!!)      etemplate       ja      
¥Õ¥£¡¼¥ë¥É¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄê¤ò¹Ô¤¤¤Þ¤¹¡£¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄꤷ¤¿¥Õ¥£¡¼¥ë¥É¤ò»ÈÍѤ·¤Æ¥¯¥¨¥ê¤ò¼Â¹Ô¤¹¤ë¤È®ÅÙ¸þ¾å¤¬Ë¾¤á¤Þ¤¹¤¬¡¢¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤ò¾ÃÈñ¤·¤Þ¤¹¡£
+application    etemplate       ja      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
+application name needed to write a langfile or dump the etemplates !!! 
etemplate       ja      
¸À¸ì¥Õ¥¡¥¤¥ë½ñ¹þ¤ß¤Þ¤¿¤ÏeTemplate¤Î¥À¥ó¥×¤Ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾¤¬É¬Íפˤʤê¤Þ¤¹!!!
+attach etemplate       ja      źÉÕ
+attach file    etemplate       ja      ¥Õ¥¡¥¤¥ëźÉÕ
+blurtext       etemplate       ja      blur¥Æ¥­¥¹¥È
+border etemplate       ja      Border
+border-line-thickness for the table-tag        etemplate       ja      
table¥¿¥°¤ÎÏÈÀþ¤ÎÂÀ¤µ¤ò»ØÄꤷ¤Þ¤¹¡£
+can have special sql-value null        etemplate       ja      
SQLÃÍNULL¤òÀßÄê²Äǽ¤«¤É¤¦¤«¤òÁªÂò¤·¤Þ¤¹¡£
+cancel etemplate       ja      ¥­¥ã¥ó¥»¥ë
+category       etemplate       ja      ¥«¥Æ¥´¥ê
+cellpadding for the table-tag  etemplate       ja      
table¥¿¥°¤Ë¤ª¤±¤ëÏÈÀþ¤È¥»¥ë¤ÎÆâÍƤδ֤ηä´Ö¤ò¥Ô¥¯¥»¥ëñ°Ì¤Ç»ØÄꤷ¤Þ¤¹¡£
+cells  etemplate       ja      ¥»¥ë
+cellspacing for the table-tag  etemplate       ja      
table¥¿¥°¤ÎÆâÏȤÎÂÀ¤µ¤ò»ØÄꤷ¤Þ¤¹¡£
+center etemplate       ja      Center
+check if content should only be displayed but not altered (the content is not 
send back then!) etemplate       ja      
ɽ¼¨¤µ¤»¤ë¤À¤±¤Ç¡¢Êѹ¹¤µ¤»¤¿¤¯¤Ê¤¤¾ì¹ç¤Ë¥Á¥§¥Ã¥¯¤òÆþ¤ì¤Þ¤¹¡Ê¤½¤Î¾ì¹ç¡¢ÆâÍƤϸµ¤ËÌá¤ê¤Þ¤»¤ó¡Ë¡£
+check if field has to be filled by user        etemplate       ja      
¥æ¡¼¥¶¡¼¤¬¥Õ¥£¡¼¥ë¥É¤òËþ¤¿¤µ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤Ë¥Á¥§¥Ã¥¯¤òÆþ¤ì¤Þ¤¹¡£
+checkbox       etemplate       ja      ¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹
+class  etemplate       ja      Class
+class, valign  etemplate       ja      Class, Valign
+click here to attach the file  etemplate       ja      
»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤òźÉÕ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
+click here to create the link  etemplate       ja      
¥ê¥ó¥¯¤òºîÀ®¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
+click here to start the search etemplate       ja      
¸¡º÷¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
+click here to upload the file  etemplate       ja      
¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
+columnname     etemplate       ja      ¥Õ¥£¡¼¥ë¥É̾
+comment        etemplate       ja      ¥³¥á¥ó¥È
+create a new table for the application etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿·µ¬¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Þ¤¹¡£
+creates an english ('en') langfile from label and helptexts (for application 
in name)  etemplate       ja      
ÀßÄꤷ¤¿¥é¥Ù¥ë¹àÌܤȥإë¥×¹àÌܤΥǡ¼¥¿¤«¤é±Ñ¸ìÍѸÀ¸ì¥Õ¥¡¥¤¥ë¡Êphpgw_en.lang¡Ë¤òºîÀ®¤·¤Þ¤¹¡£
+css class for the table-tag    etemplate       ja      
table¥¿¥°¤ËÂФ¹¤ëCSS¥¯¥é¥¹¤ò»ØÄꤷ¤Þ¤¹¡£
+css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = 
alternating nm row, 'nmr0'+'nmr1' nm rows       etemplate       ja      
¤³¤Î¹Ô¤ËÂФ¹¤ëCSS¥¯¥é¥¹Ì¾¡Ê¥×¥ê¥»¥Ã¥È:'nmh'=NextMatch¥Ø¥Ã¥À,'nmr'=NextMatch¤Î¸ò¸ß¤ËÇØ·Ê¿§¤¬ÀÚÂؤï¤ë¹Ô,'nmr0'+'nmr1'=NextMatch¤Î¹Ô¡Ë,½ÄÊý¸þ¤Îɽ¼¨°ÌÃÖ
+css-styles     etemplate       ja      CSS¥¹¥¿¥¤¥ë
+date   etemplate       ja      ÆüÉÕ
+date+time      etemplate       ja      ÆüÉÕ+»þ´Ö
+datum  etemplate       ja      ¥Ç¡¼¥¿
+day    etemplate       ja      Æü
+db ensures that every row has a unique value in that column    etemplate       
ja      ¤½¤Î¥Õ¥£¡¼¥ë¥É¤Ë´Ø¤·¤Æ¡¢³Æ¥ì¥³¡¼¥É¤¬¥æ¥Ë¡¼¥¯¤ÊÃͤò»ý¤Ä¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+db-tools       etemplate       ja      DB¥Ä¡¼¥ë
+deck   etemplate       ja      ¥Ç¥Ã¥¯¡ÊÆ⢡Ë
+default        etemplate       ja      ¥Ç¥Õ¥©¥ë¥È
+delete etemplate       ja      ºï½ü
+delete a single entry by passing the id.       etemplate       ja      
ID¤ò»È¤Ã¤Æ¡¢£±¤Ä¤Î¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹¡£
+delete all selected etemplates, without further inquiry        etemplate       
ja      ÁªÂò¤·¤¿Á´¤Æ¤ÎeTemplate¤òºÆ³Îǧ¤¹¤ë¤³¤È¤Ê¤¯ºï½ü¤·¤Þ¤¹¡£
+delete column  etemplate       ja      ¥Õ¥£¡¼¥ë¥Éºï½ü
+delete this etemplate  etemplate       ja      ¤³¤ÎeTemplate¤òºï½ü¤·¤Þ¤¹¡£
+delete whole column (can not be undone!!!)     etemplate       ja      
¥«¥é¥àÁ´ÂΤòºï½ü¤·¤Þ¤¹¡ÊUndo¤Ç¤­¤Þ¤»¤ó!!!¡Ë
+deletes the above spez. etemplate from the database, can not be undone 
etemplate       ja      
»ØÄꤷ¤¿eTemplate¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤·¤Þ¤¹¡ÊUndo¤Ï¤Ç¤­¤Þ¤»¤ó¡Ë¡£
+deletes the etemplate spez. above      etemplate       ja      
»ØÄꤷ¤¿eTemplate̾¤Î¥Ç¡¼¥¿¤òºï½ü¤·¤Þ¤¹¡£
+deletes this column    etemplate       ja      »ØÄê¹Ô¤Î¥Õ¥£¡¼¥ë¥É¤òºï½ü¤·¤Þ¤¹¡£
+discard changes        etemplate       ja      
+displayed in front of input or input is inserted for a '%s' in the label 
(label of the submitbutton or image-filename) etemplate       ja      
input¥¿¥°¤ÎÁ°¤Ëɽ¼¨¤¹¤ë¥Æ¥­¥¹¥È¤Þ¤¿¤ÏSubmit¥Ü¥¿¥ó¤ä¥¤¥á¡¼¥¸¤Î¥é¥Ù¥ë¤È¤·¤ÆÁÞÆþ¤µ¤ì¤ë¥Æ¥­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£
+displayed in statusline of browser if input-field gets focus   etemplate       
ja      
ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤Ë¥Õ¥©¡¼¥«¥¹¤¬Åö¤¿¤Ã¤¿¾ì¹ç¤Ë¡¢¥Ö¥é¥¦¥¶¤Î¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤Ëɽ¼¨¤¹¤ë¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Þ¤¹¡£
+do you want to save the changes you made in table %s?  etemplate       ja      
¥Æ¡¼¥Ö¥ë¡Ê%s¡Ë¤Ç¹Ô¤Ã¤¿Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«¡©
+drop a table - this can not be undone  etemplate       ja      
¥Æ¡¼¥Ö¥ë¤òºï½ü¤·¤Þ¤¹(Undo¤Ï¤Ç¤­¤Þ¤»¤ó¡Ë¡£
+drop table     etemplate       ja      ¥Æ¡¼¥Ö¥ëºï½ü
+dump4setup     etemplate       ja      SetupÍÑ¥À¥ó¥×
+edit   etemplate       ja      ÊÔ½¸
+edit the etemplate spez. above etemplate       ja      
»ØÄꤷ¤¿eTemplate¤òÊÔ½¸¤·¤Þ¤¹¡£
+editable templates - db-tools  etemplate       ja      eTemplate ¡Ý DB¥Ä¡¼¥ë
+editable templates - delete template   etemplate       ja      eTemplate ¡Ý 
¥Æ¥ó¥×¥ì¡¼¥Èºï½ü
+editable templates - editor    etemplate       ja      eTemplate ¡Ý ¥¨¥Ç¥£¥¿
+editable templates - search    etemplate       ja      eTemplate ¡Ý ¸¡º÷
+editable templates - show template     etemplate       ja      eTemplate ¡Ý 
¥Æ¥ó¥×¥ì¡¼¥Èɽ¼¨
+embeded css styles, eg. '.red { background: red; }' (note the '.' before the 
class-name) or '@import url(...)' (class names are global for the whole page!)  
  etemplate       ja      CSS¥¹¥¿¥¤¥ë¥·¡¼¥È¤òËä¤á¹þ¤ß¤Þ¤¹¡£Îã¡¥'.red { 
background: red; }'¡Ê¥¯¥é¥¹Ì¾¤ÎÁ°¤Ë¥É¥Ã¥È'.'¤¬É¬ÍפǤ¹¡Ë¡¢'@import 
url(...)'¡Ê¥¯¥é¥¹Ì¾¤Ï¥Ú¡¼¥¸Á´ÂΤ˱ƶÁ¤·¤Þ¤¹!¡Ë
+enable javascript onchange submit      etemplate       ja      
JavaScript¤òÍøÍѤ·¤¿onChange¥¤¥Ù¥ó¥È¤ÇSubmit¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
+enter '' for an empty default, nothing mean no default etemplate       ja      
¥¨¥ó¥×¥Æ¥£¡¦¥Ç¥Õ¥©¥ë¥ÈÃͤȤ¹¤ë¤Ë¤Ï¡¢¶õʸ»ú¡Ê''¡Ë¤òÆþÎϤ·¤Þ¤¹¡£¶õÍó¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ê¤·¤ò°ÕÌ£¤·¤Þ¤¹¡£
+enter a search pattern etemplate       ja      ¸¡º÷¥Ñ¥¿¡¼¥ó¤òÆþÎϤ·¤Þ¤¹¡£
+enter filename to upload and attach, use [browse...] to search for it  
etemplate       ja      
¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£[»²¾È...]¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Æ»ØÄê¤Ç¤­¤Þ¤¹¡£
+enter the new version number here (> old_version), empty for no update-file    
etemplate       ja      
¿·¤·¤¤¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¡Êµì¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤âÂ礭¤¤ÈÖ¹æ¡Ë¤ò¤³¤³¤ËÆþÎϤ·¤Þ¤¹¡Ê¶õÍó¤Î¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤»¤ó¡Ë¡£
+enter the new version number here (has to be > old_version)    etemplate       
ja      ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¡Êµì¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤âÂ礭¤¤ÈÖ¹æ¡Ë¤ò¤³¤³¤ËÆþÎϤ·¤Þ¤¹¡£
+entry saved    etemplate       ja      ¥¨¥ó¥È¥ê¤òÊݸ¤·¤Þ¤·¤¿¡£
+error: template not found !!!  etemplate       ja      
¥¨¥é¡¼¡§¥Æ¥ó¥×¥ì¡¼¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!!!
+error: webserver is not allowed to write into '%1' !!! etemplate       ja      
¥¨¥é¡¼¡§Web¥µ¡¼¥Ð¡¼¤¬'%1'¤Ø½ñ¹þ¤ß¤ò¹Ô¤¦¤³¤È¤òµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!!!
+error: while saveing !!!       etemplate       ja      
¥¨¥é¡¼¡§ÊݸÃæ¤ËÉÔ¶ñ¹ç¤¬È¯À¸¤·¤Þ¤·¤¿!!!
+error: writeing !!!    etemplate       ja      
¥¨¥é¡¼¡§½ñ¤­¹þ¤ßÃæ¤ËÉÔ¶ñ¹ç¤¬È¯À¸¤·¤Þ¤·¤¿!!!
+error: writing file (no write-permission for the webserver) !!!        
etemplate       ja      
¥¨¥é¡¼¡§¥Õ¥¡¥¤¥ë½ñ¹þ¤ß¡ÊWeb¥µ¡¼¥Ð¡¼¤ËÂФ¹¤ë½ñ¹þ¤ß¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó¡Ë
+etemplate      common  ja      eTemplate
+etemplate '%1' imported, use save to put it in the database    etemplate       
ja      
eTemplate¡Ê'%1'¡Ë¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿¡£¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆâÍƤ¬½ñ¤­´¹¤¨¤é¤ì¤Þ¤·¤¿¡£
+etemplate '%1' written to '%2' etemplate       ja      
eTemplate¡Ê'%1'¡Ë¤òXML¥Õ¥¡¥¤¥ë'%2'¤Ë½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£
+etemplate editor       etemplate       ja      eTemplate¥¨¥Ç¥£¥¿
+exchange this row with the one above   etemplate       ja      
¤³¤Î¹Ô¤È¾å¤Î¹Ô¤òÆþÂؤ¨¤Þ¤¹¡£
+exchange this two columns      etemplate       ja      
£²¤Ä¤Î¥«¥é¥à¤òÆþÂؤ¨¤Þ¤¹¡£
+export the loaded etemplate into a xml-file    etemplate       ja      
¥í¡¼¥É¤µ¤ì¤Æ¤¤¤ëeTemplate¥Ç¡¼¥¿¤òXML¥Õ¥¡¥¤¥ë¤Ë¥¨¥¯¥¹¥Ý¡¼¥È¤·¤Þ¤¹¡£
+export xml     etemplate       ja      XML¥¨¥¯¥¹¥Ý¡¼¥È
+extensions loaded:     etemplate       ja      ¥í¡¼¥ÉºÑ¤ß³ÈÄ¥¥â¥¸¥å¡¼¥ë¡§
+file   etemplate       ja      ¥Õ¥¡¥¤¥ë
+file contains more than one etemplate, last one is shown !!!   etemplate       
ja      
¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢£±¤Ä°Ê¾å¤ÎeTemplate¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ¿·¤ÎeTemplate¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+file writen    etemplate       ja      
+fileupload     etemplate       ja      ¥Õ¥¡¥¤¥ë¥¢¥Ã¥×¥í¡¼¥É
+first  etemplate       ja      ºÇ½é¤Î¥Ú¡¼¥¸
+floating point etemplate       ja      ÉâÆ°¾®¿ôÅÀ
+for <b>more information</b> check out the <a 
href="etemplate/doc/etemplate.html" target="_blank">tutorial</a>, the <a 
href="etemplate/doc/referenz.html" target="_blank">referenz documentation</a> 
or the <a href="http://docs.phpgroupware.org/wiki/etemplate"; 
target="_blank">etemplate page in our wiki</a>.       common  ja      <a 
href="etemplate/doc/etemplate.html" target="_blank">¥Á¥å¡¼¥È¥ê¥¢¥ë</a>¡¢<a 
href="etemplate/doc/referenz.html" 
target="_blank">»²¹Í¥É¥­¥å¥á¥ó¥È</a>¡¢Wiki¤Ë¤¢¤ë<a 
href="http://docs.phpgroupware.org/wiki/etemplate"; 
target="_blank">eTemplate¥Ú¡¼¥¸</a>Åù¤Ë¾ÜºÙ¤Ê¾ðÊ󤬤¢¤ê¤Þ¤¹¡£
+foreign key    etemplate       ja      ³°Éô¥­¡¼
+go to the first entry  etemplate       ja      ºÇ½é¤Î¥Ú¡¼¥¸¤ØÌá¤ê¤Þ¤¹¡£
+go to the last entry   etemplate       ja      ºÇ¸å¤Î¥Ú¡¼¥¸¤Ø¿Ê¤ß¤Þ¤¹¡£
+go to the next page of entries etemplate       ja      ¼¡¥Ú¡¼¥¸¤Ø¿Ê¤ß¤Þ¤¹¡£
+go to the previous page of entries     etemplate       ja      
Á°¥Ú¡¼¥¸¤ØÌá¤ê¤Þ¤¹¡£
+hbox   etemplate       ja      HBox
+height etemplate       ja      Height
+height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: 
'address@hidden' disable row if content of data is empty    etemplate       ja  
    ¹Ô¤Î¹â¤µ¡Ê%¤Þ¤¿¤Ï¥Ô¥¯¥»¥ë»ØÄê¡Ë,¹Ô¤Î̵¸ú²½¡Ê½ñ¼°¡§[! = 
not]<value>[=<check>]¡¢Î㡧'address@hidden'¤Ç¤¢¤ì¤Ð¡¢dataÆâÍƤ¬¶õÍó¤Î¾ì¹ç¤Ë¹Ô¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡Ë
+height of the table in % or pixels for the table-tag and (optional) div        
etemplate       ja      
table¥¿¥°¤Èdiv¥¿¥°¡Ê¥ª¥×¥·¥ç¥ó¡Ë¤Î¥Æ¡¼¥Ö¥ë¹â¤µ¤ò%»ØÄê¤Þ¤¿¤Ï¥Ô¥¯¥»¥ë»ØÄê¤ÇÆþÎϤ·¤Þ¤¹¡£
+height, disabled       etemplate       ja      Height, Disabled
+help   etemplate       ja      ¥Ø¥ë¥×
+horizontal rule        etemplate       ja      ¿åÊ¿·ÓÀþ
+hour   etemplate       ja      »þ
+html   etemplate       ja      Html
+if field is disabled an empty table-cell is displayed, for (temporal) 
removement of a field/cell       etemplate       ja      
¥Õ¥£¡¼¥ë¥É¤ò̵¸ú¤Ë¤¹¤ë¤È¡¢°ì»þŪ¤Ê¥Õ¥£¡¼¥ë¥É/¥»¥ë¤Î½üµî¤Î°Ù¤Ë¡¢¶õ¤Îtable¥»¥ë¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+image  etemplate       ja      ¥¤¥á¡¼¥¸
+import etemplate       ja      ¥¤¥ó¥Ý¡¼¥È
+import an etemplate from a xml-file    etemplate       ja      
XML¥Õ¥¡¥¤¥ë¤«¤éeTemplate¥Ç¡¼¥¿¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
+import table-definitions from existing db-table        etemplate       ja      
´û¸¤ÎDB¥Æ¡¼¥Ö¥ë¤«¤é¥Æ¡¼¥Ö¥ëÄêµÁÆâÍƤò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
+import xml     etemplate       ja      XML¥¤¥ó¥Ý¡¼¥È
+index/name of returned content (name of the template, link / method for image) 
etemplate       ja      
¥Õ¥©¡¼¥à¥³¥ó¥È¥í¡¼¥ë¤ÎID°À­/NAME°À­¤ò»ØÄꤷ¤Þ¤¹¡Ê¥Æ¥ó¥×¥ì¡¼¥È¤Î̾Á°¤ä¥¤¥á¡¼¥¸¤Î¥ê¥ó¥¯/¥á¥½¥Ã¥É¤È¤·¤Æ¤â»ÈÍѤµ¤ì¤Þ¤¹¡Ë¡£
+indexed        etemplate       ja      ¥¤¥ó¥Ç¥Ã¥¯¥¹
+insert new column behind this one      etemplate       ja      
¤³¤Î¥«¥é¥à¤Î¸å¤Ë¿·µ¬¥«¥é¥à¤òÁÞÆþ¤·¤Þ¤¹¡£
+insert new column in front of all      etemplate       ja      
£±ÎóÌܤ˿·µ¬¥«¥é¥à¤òÁÞÆþ¤·¤Þ¤¹¡£
+insert new row after this one  etemplate       ja      
¤³¤Î¹Ô¤Î¸å¤Ë¿·¤·¤¤¹Ô¤òÁÞÆþ¤·¤Þ¤¹¡£
+insert new row in front of first line  etemplate       ja      
£±¹ÔÌܤ˿·¤·¤¤¹Ô¤òÁÞÆþ¤·¤Þ¤¹¡£
+integer        etemplate       ja      À°¿ô
+key    etemplate       ja      ¥­¡¼
+label  etemplate       ja      ¥é¥Ù¥ë
+label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] 
t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] 
select:[multiselect] date:[values: eg. 'y-m-d']    etemplate       ja      
¥é¥Ù¥ë:[bold][italic] ¥Æ¥­¥¹¥È:[len][,max] ¿ôÃÍ¥Õ¥£¡¼¥ë¥É:[min][,[max][,len]] 
¥Æ¥­¥¹¥È¥¨¥ê¥¢:[rows][,cols] ¥é¥¸¥ª¥Ü¥¿¥ó:value ¿åÊ¿·ÓÀþ:[width] 
¥Æ¥ó¥×¥ì¡¼¥È:[IndexInContent] ¥»¥ì¥¯¥È¥Ü¥Ã¥¯¥¹:[multiselect] ÆüÉÕ:[values: eg. 
'Y-m-d']
+lang   etemplate       ja      ¸À¸ì
+language-short (eg. 'en' for english) for language-dependent template ('' 
reads your pref. languages or the default, us 'default' to read the default 
template '')     etemplate       ja      
¸À¸ì°Í¸¥Æ¥ó¥×¥ì¡¼¥È¤ËÂФ¹¤ë¸À¸ì¡ÊÎã¡¥English¤Î¾ì¹ç¤Ï'en'¡Ë¤ò»ØÄꤷ¤Þ¤¹¡Ê¶õÍó¤Î¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥ÈÃͤȤ·¤Æ°·¤ï¤ì¤Þ¤¹¡Ë¡£
+last   etemplate       ja      ºÇ¸å¤Î¥Ú¡¼¥¸
+left   etemplate       ja      Left
+length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8       
etemplate       ja      
char/varchar·¿¤Î¥Ð¥¤¥ÈĹ¡¢int·¿¤Î¥Ð¥¤¥ÈĹ(2,4,8)¡¢float·¿¤Î¥Ð¥¤¥ÈĹ(4,8)¤ò»ØÄꤷ¤Þ¤¹¡£
+link   etemplate       ja      ¥ê¥ó¥¯
+linklist       etemplate       ja      ¥ê¥ó¥¯¥ê¥¹¥È
+linkstring     etemplate       ja      ¥ê¥ó¥¯Ê¸»úÎó
+linkto etemplate       ja      ¥ê¥ó¥¯Àè
+load this template into the editor     etemplate       ja      
¤³¤Î¥Æ¥ó¥×¥ì¡¼¥È¤ò¥¨¥Ç¥£¥¿¤ËÆɤ߹þ¤ß¤Þ¤¹¡£
+minute etemplate       ja      ʬ
+month  etemplate       ja      ·î
+name   etemplate       ja      ̾Á°
+name of other table where column is a key from etemplate       ja      
+name of phpgw-template set (e.g. verdilak): '' = default (will read pref. 
template, us 'default' to read default template '')  etemplate       ja      
phpGroupWare¥Æ¥ó¥×¥ì¡¼¥È̾¤ò»ØÄꤷ¤Þ¤¹¡ÊÎã¡¥verdilak¡¢¶õÍó¤Î¾ì¹ç¤Ïdefault¡Ë¡£
+name of table to add   etemplate       ja      
Äɲ乤ë¥Æ¡¼¥Ö¥ë¤Î̾Á°¤òÆþÎϤ·¤Þ¤¹¡£
+name of the etemplate, should be in form application.function[.subtemplate]    
etemplate       ja      
eTemplate̾¡Ê½ñ¼°¡§application.function[.subTemplate]¡Ë¤òÆþÎϤ·¤Þ¤¹¡£
+need to be unique in the table and no reseved word from sql, best prefix all 
with a common 2-digit short for the app, eg. 'et_'        etemplate       ja    
  
¥Æ¡¼¥Ö¥ëÆâ¤Ç¥æ¥Ë¡¼¥¯¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢SQL¤ÎͽÌó¸ì¤Ç¤â¤¤¤±¤Þ¤»¤ó¡£¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¶¦Ä̤Î2ʸ»ú¤ÎÀÜƬ¸ì¤ò¤Ä¤±¤¿¥Õ¥£¡¼¥ë¥É̾(Îã¡¥et_)¤ò»ØÄꤹ¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£
+new search     etemplate       ja      ¸¡º÷¥¯¥ê¥¢
+new table created      etemplate       ja      ¿·µ¬¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Þ¤·¤¿¡£
+newer version '%1' exists !!!  etemplate       ja      
»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤â¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó'%1'¤¬Â¸ºß¤·¤Þ¤¹!!!
+next   etemplate       ja      ¼¡¥Ú¡¼¥¸
+nextmatch      etemplate       ja      Nextmatch
+no file        etemplate       ja      ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó
+no filename given or selected via browse...    etemplate       ja      
[»²¾È...]¤òÄ̤·¤ÆÁªÂò»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó¡£
+nothing found - try again !!!  etemplate       ja      
¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£ºÆ»î¹Ô¤·¤Æ¤¯¤À¤µ¤¤!!!
+nothing matched search criteria !!!    etemplate       ja      
¸¡º÷¾ò·ï¤Ç°ìÃפ¹¤ë¥ì¥³¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó!!!
+nullable       etemplate       ja      NULLµö²Ä
+number of colums the field/cell should span or 'all' for the remaining 
columns, css-class name (for the td tag)        etemplate       ja      
¥Õ¥£¡¼¥ë¥É/¥»¥ë¤Î²£Êý¸þ¤ØÏ¢·ë¤¹¤ë¸Ä¿ô¡Ê'all'¤È¤¹¤ë¤È»Ä¤ê¤Î¥«¥é¥à¤òÏ¢·ë¡Ë,TD¥¿¥°¤ËÂФ¹¤ëCSS¥¯¥é¥¹Ì¾
+number of rows/cols in a v/hbox, cellpadding, cellspacing      etemplate       
ja      VBox/HBox¤Î¹Ô¿ô/Îó¿ô,CellpaddingÃÍ,CellspacingÃÍ
+of     etemplate       ja      of
+only an other version found !!!        etemplate       ja      
¾¤Î¥Ð¡¼¥¸¥ç¥ó¤·¤«¸«¤Ä¤«¤ê¤Þ¤»¤ó!!!
+optional note about the link   etemplate       ja      
¥ê¥ó¥¯¤Ë´Ø¤¹¤ë¥³¥á¥ó¥ÈÆþÎÏÍó¤Ç¤¹¡£
+options        etemplate       ja      ¥ª¥×¥·¥ç¥ó
+overflow       etemplate       ja      Overflow
+padding        etemplate       ja      Padding
+please enter table-name first !!!      etemplate       ja      
ºÇ½é¤Ë¥Æ¡¼¥Ö¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤!!!
+pm     etemplate       ja      PM
+precision      etemplate       ja      ¥Õ¥£¡¼¥ë¥ÉĹ
+previous       etemplate       ja      Á°¥Ú¡¼¥¸
+primary key    etemplate       ja      ¥×¥é¥¤¥Þ¥ê¥­¡¼
+primary key for the table, gets automaticaly indexed   etemplate       ja      
¥Æ¡¼¥Ö¥ë¤Î¥×¥é¥¤¥Þ¥ê¥­¡¼¤ò»ØÄꤷ¤Þ¤¹¡£¥×¥é¥¤¥Þ¥ê¥­¡¼¤Î»ØÄê¤ò¤¹¤ë¤È¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
+radiobutton    etemplate       ja      ¥é¥¸¥ª¥Ü¥¿¥ó
+read   etemplate       ja      Æɹþ¤ß
+read a list of entries.        etemplate       ja      
¥¨¥ó¥È¥ê°ìÍ÷¤ò±ÜÍ÷¤·¤Þ¤¹¡£
+read a single entry by passing the id and fieldlist.   etemplate       ja      
IDµÚ¤Ó¥Õ¥£¡¼¥ë¥É¥ê¥¹¥È¤òÄ̤·¤Æ¡¢£±¤Ä¤Î¥¨¥ó¥È¥ê¤ò±ÜÍ÷¤·¤Þ¤¹¡£
+read etemplate from database (for the keys above)      etemplate       ja      
eTemplate̾¤ò¸µ¤Ë¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éeTemplate¥Ç¡¼¥¿¤òÆɤ߹þ¤ß¤Þ¤¹¡£
+remove row (can not be undone!!!)      etemplate       ja      
»ØÄê¹Ô¤òºï½ü¤·¤Þ¤¹¡ÊUndo¤Ç¤­¤Þ¤»¤ó!!!¡Ë
+remove this link (not the entry itself)        etemplate       ja      
»ØÄꤷ¤¿¥ê¥ó¥¯¤òºï½ü¤·¤Þ¤¹¡Ê¥¨¥ó¥È¥ê¼«ÂΤϺï½ü¤µ¤ì¤Þ¤»¤ó¡Ë¡£
+returns savely, without deleting       etemplate       ja      
ºï½ü¤·¤Ê¤¤¤Ç¡¢¥¨¥Ç¥£¥¿²èÌ̤ËÌá¤ê¤Þ¤¹¡£
+right  etemplate       ja      Right
+save   etemplate       ja      Êݸ
+save the etemplate under the above keys (name, ...), change them for a saveas  
etemplate       ja      
eTemplate̾¤ò¥­¡¼¤Ë¤·¤Æ¡¢¥Ç¡¼¥¿¤òÊݸ¤·¤Þ¤¹¡£eTemplate̾¤òÊѹ¹¤¹¤ë¤È¡¢¿·µ¬Êݸ¡Ê̾Á°¤òÉÕ¤±¤ÆÊݸ¡Ë¤µ¤ì¤Þ¤¹¡£
+saves changes to tables_current.inc.php        etemplate       ja      
Êѹ¹ÅÀ¤ò'tables_current.inc.php'¤ËÊݸ¤·¤Þ¤¹¡£
+scale  etemplate       ja      ¥¹¥±¡¼¥ë
+scale for float        etemplate       ja      ÉâÆ°¾¯¿ôÅÀ¤Î¥¹¥±¡¼¥ë¤Ç¤¹¡£
+search etemplate       ja      ¸¡º÷
+select a category      etemplate       ja      ¥«¥Æ¥´¥ê¤òÁªÂò¤·¤Þ¤¹¡£
+select a primary contact, to show in the list  etemplate       ja      
¥ê¥¹¥È¤Ëɽ¼¨¤¹¤ë¥×¥é¥¤¥Þ¥ê¡¦¥³¥ó¥¿¥¯¥È¤òÁªÂò¤·¤Þ¤¹¡£
+select access  etemplate       ja      ¥¢¥¯¥»¥¹ÁªÂò
+select account etemplate       ja      ¥¢¥«¥¦¥ó¥ÈÁªÂò
+select an app first !!!        etemplate       ja      
ºÇ½é¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹!!!
+select an app to search in     etemplate       ja      
+select an application  etemplate       ja      ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£
+select an application, (*) = uninstalled       etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£(*) = ¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß
+select an entry to link with   etemplate       ja      
¥ê¥ó¥¯¤µ¤»¤ë¥¨¥ó¥È¥ê¤òÁªÂò¤·¤Þ¤¹¡£
+select an table of the application     etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Æ¡¼¥Ö¥ë¤òÁªÂò¤·¤Þ¤¹¡£
+select application     etemplate       ja      ¥¢¥×¥ê¥±¡¼¥·¥ç¥óÁªÂò
+select category        etemplate       ja      ¥«¥Æ¥´¥êÁªÂò
+select country etemplate       ja      ¹ñÁªÂò
+select day     etemplate       ja      ÆüÁªÂò
+select if content of field should not be translated (label gets always 
translated)     etemplate       ja      
¥Õ¥£¡¼¥ë¥ÉÆâÍƤòËÝÌõ¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤·¤Þ¤¹¡Ê¥é¥Ù¥ë¤Ï¾ï¤ËËÝÌõ¤µ¤ì¤Þ¤¹¡Ë¡£
+select month   etemplate       ja      ·îÁªÂò
+select number  etemplate       ja      ÈÖ¹æÁªÂò
+select one ... etemplate       ja      ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤
+select percentage      etemplate       ja      ¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸ÁªÂò
+select priority        etemplate       ja      ¥×¥é¥¤¥ª¥ê¥Æ¥£ÁªÂò
+select state   etemplate       ja      ½£ÁªÂò
+select this etemplate to delete it     etemplate       ja      
¤³¤Î¥Æ¥ó¥×¥ì¡¼¥È¤òÁªÂò¤·¤Æ¡¢ºï½ü¤·¤Þ¤¹¡£
+select year    etemplate       ja      ǯÁªÂò
+selectbox      etemplate       ja      ¥»¥ì¥¯¥È¥Ü¥Ã¥¯¥¹
+sets today as date     etemplate       ja      
+show   etemplate       ja      ɽ¼¨
+show (no save) etemplate       ja      
+show values    etemplate       ja      ÃÍɽ¼¨
+showing        etemplate       ja      ɽ¼¨¿ô
+shows / allows you to enter values into the etemplate for testing      
etemplate       ja      ¥Æ¥¹¥ÈÌÜŪ¤ÇeTemplate¤ËÃͤòÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+shows/displays etemplate for testing, does not save it before  etemplate       
ja      
eTemplate¥Ç¡¼¥¿¤ò¥Æ¥¹¥Èɽ¼¨¤·¤Þ¤¹¡Êɽ¼¨¤¹¤ëÁ°¤Ë¥Ç¡¼¥¿Êݸ¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡Ë¡£
+spacing        etemplate       ja      Spacing
+span, class    etemplate       ja      Span, Class
+stack  etemplate       ja      
+start a new search, cancel this link   etemplate       ja      
¥ê¥ó¥¯»ØÄê¤ò¥­¥ã¥ó¥»¥ë¤·¤Æ¡¢¿·µ¬¸¡º÷¥â¡¼¥É¤ËÌá¤ê¤Þ¤¹¡£
+start new search for the above pattern etemplate       ja      
¾åµ­¥Ñ¥¿¡¼¥ó¤Ç¿·µ¬¸¡º÷¤ò³«»Ï¤·¤Þ¤¹¡£
+submitbutton   etemplate       ja      Submit¥Ü¥¿¥ó
+table unchanged, no write necessary !!!        etemplate       ja      
¥Æ¡¼¥Ö¥ë¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Î¤Ç¡¢É¬Íפʽñ¹þ¤ß½èÍý¤Ï¤¢¤ê¤Þ¤»¤ó!!!
+tablename      etemplate       ja      ¥Æ¡¼¥Ö¥ë̾
+tabs   etemplate       ja      ¥¿¥Ö
+template       etemplate       ja      ¥Æ¥ó¥×¥ì¡¼¥È
+template deleted       etemplate       ja      ¥Æ¥ó¥×¥ì¡¼¥È¤òºï½ü¤·¤Þ¤·¤¿¡£
+template saved etemplate       ja      ¥Æ¥ó¥×¥ì¡¼¥È¤òÊݸ¤·¤Þ¤·¤¿¡£
+text   etemplate       ja      ¥Æ¥­¥¹¥È
+textarea       etemplate       ja      ¥Æ¥­¥¹¥È¥¨¥ê¥¢
+this text gets displayed if the input-field is empty and has no focus (blur)   
etemplate       ja      
ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤¬¶õÍó¾õÂ֤ǥե©¡¼¥«¥¹¤ò¼º¤Ã¤¿ºÝ¤Ëɽ¼¨¤¹¤ë¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Þ¤¹¡£
+time   etemplate       ja      »þ´Ö
+to start the db-tools  etemplate       ja      DB¥Ä¡¼¥ë¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+to start the etemplate editor  etemplate       ja      
eTemplate¥¨¥Ç¥£¥¿¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+to start the search    etemplate       ja      ¸¡º÷¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+today  etemplate       ja      º£Æü
+type   etemplate       ja      ¥¿¥¤¥×
+type of the column     etemplate       ja      ¥Õ¥£¡¼¥ë¥É¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£
+type of the field (select label if field should be empty)      etemplate       
ja      
¥Õ¥£¡¼¥ë¥É¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡Ê¥Õ¥£¡¼¥ë¥É¤ò¶õÍó¤Ë¤¹¤ë¾ì¹ç¤Ï¡¢¥é¥Ù¥ë¤òÁªÂò¤·¤Þ¤¹¡Ë¡£
+unique etemplate       ja      ¥æ¥Ë¡¼¥¯
+unlink etemplate       ja      ºï½ü
+update a single entry by passing the fields.   etemplate       ja      
¤½¤Î¥Õ¥£¡¼¥ë¥É¤òÄ̤·¤Æ¡¢£±¤Ä¤Î¥¨¥ó¥È¥ê¤ò¹¹¿·¤·¤Þ¤¹¡£
+update from version '%s' to    etemplate       ja      ¥Æ¡¼¥Ö¥ë¹¹¿· ¥Ð¡¼¥¸¥ç¥ó 
'%s' ==> ¥Ð¡¼¥¸¥ç¥ó¡§
+upload etemplate       ja      ¥¢¥Ã¥×¥í¡¼¥É
+value  etemplate       ja      ÃÍ
+vbox   etemplate       ja      VBox
+version        etemplate       ja      ¥Ð¡¼¥¸¥ç¥ó
+version-number, should be in the form: major.minor.revision.number (eg. 
0.9.13.001 all numbers filled up with zeros)   etemplate       ja      
¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¡Ê½ñ¼°¡§major.minor.revision.number¡¢Î㡧0.9.13.001¡Ë¤òÆþÎϤ·¤Þ¤¹¡£¶õÍó¤Î¾ì¹ç¤Ï¡¢ºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤¬¼«Æ°ÁªÄꤵ¤ì¤Þ¤¹¡£
+view this linked entry in its application      etemplate       ja      
´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¹àÌܤòɽ¼¨¤·¤Þ¤¹
+what happens with overflowing content: visible (default), hidden, scroll, auto 
(browser decides)       etemplate       ja      
Îΰè¤ò¤Ï¤ß½Ð¤·¤¿Í×ÁǤΰ·¤¤¤ò¡¢visible¡Êµ¬ÄêÃÍ¡§É½¼¨¤¹¤ë¡Ë,hidden¡Ê±£¤¹¡Ë,scroll¡Ê¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Çɽ¼¨¤¹¤ë¡Ë,auto¡Ê¼«Æ°¡Ë¤Î¤¤¤º¤ì¤«¤Ç»ØÄꤷ¤Þ¤¹¡£
+width  etemplate       ja      Width
+width of col (in % or pixel), disable col: [! = not]<value>[=<check>] eg: 
'address@hidden' disable col if content of data is empty     etemplate       ja 
     ¥«¥é¥àÉý¡Ê%¤Þ¤¿¤Ï¥Ô¥¯¥»¥ë»ØÄê¡Ë,¥«¥é¥à̵¸ú²½¡Ê½ñ¼°¡§[! = 
not]<value>[=<check>]¡¢Î㡧'address@hidden'¤Ç¤¢¤ì¤Ð¡¢dataÆâÍƤ¬¶õÍó¤Î¾ì¹ç¤Ë¥«¥é¥à¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡Ë
+width of the table in % or pixels for the table-tag and (optional) div 
etemplate       ja      
table¥¿¥°¤Èdiv¥¿¥°¡Ê¥ª¥×¥·¥ç¥ó¡Ë¤Î¥Æ¡¼¥Ö¥ëÉý¤ò%»ØÄê¤Þ¤¿¤Ï¥Ô¥¯¥»¥ë»ØÄê¤ÇÆþÎϤ·¤Þ¤¹¡£
+width, disabled        etemplate       ja      Width, Disabled
+write <app>/setup/tables_current.inc.php       etemplate       ja      
<¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾>/setup/tables_current.inc.php¤Ë¥Æ¡¼¥Ö¥ëÆâÍƤò½ñ¤­¹þ¤ß¤Þ¤¹¡£
+write langfile etemplate       ja      ¸À¸ì¥Õ¥¡¥¤¥ë½ñ¹þ¤ß
+write tables   etemplate       ja      ¥Æ¡¼¥Ö¥ë½ñ¹þ¤ß
+writes a 'etemplates.inc.php' file (for application in name) in the setup-dir 
of the app       etemplate       ja      
¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îsetup¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë'etemplates.inc.php'¥Õ¥¡¥¤¥ë¤Ë¥Ç¡¼¥¿¤ò½ñ¤­½Ð¤·¤Þ¤¹¡£
+xml-file to import     etemplate       ja      ¥¤¥ó¥Ý¡¼¥È¤¹¤ëXML¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
+xslt template  etemplate       ja      XSLT¥Æ¥ó¥×¥ì¡¼¥È
+year   etemplate       ja      ǯ




reply via email to

[Prev in Thread] Current Thread [Next in Thread]