[Phpgroupware-cvs] qmailldap/setup tables_current.inc.php, 1.4 setup.inc.php, 1.9 phpgw_ja.lang, 1.3 phpgw_fr.lang, 1.6 tables_update.inc.php, 1.7 phpgw_en.lang, 1.7 phpgw_de.lang, 1.13

[ceb]

Update of qmailldap/setup

Modified Files:
     Branch: MAIN
            tables_current.inc.php lines: +3 -5
            setup.inc.php lines: +13 -12
            phpgw_ja.lang lines: +1 -1
            phpgw_fr.lang lines: +1 -1
            tables_update.inc.php lines: +0 -0
            phpgw_en.lang lines: +5 -1
            phpgw_de.lang lines: +1 -2

Log Message:
update 16 to head

====================================================
Index: qmailldap/setup/tables_current.inc.php
diff -u qmailldap/setup/tables_current.inc.php:1.3 
qmailldap/setup/tables_current.inc.php:1.4
--- qmailldap/setup/tables_current.inc.php:1.3  Sat Sep  1 22:44:55 2001
+++ qmailldap/setup/tables_current.inc.php      Mon Mar 14 12:03:10 2005
@@ -1,8 +1,7 @@
 <?php
        
/**************************************************************************\
-       * phpGroupWare                                                          
   *
+       * phpGroupWare  QMailLDAP                                               
   *
        * http://www.phpgroupware.org                                           
   *
-       * http://www.phpgw.de                                                   
   *
        * Author: address@hidden                                               *
        * --------------------------------------------                          
   *
        *  This program is free software; you can redistribute it and/or modify 
it *
@@ -10,13 +9,12 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-
        /* $Id$ */

        $phpgw_baseline = array(
                'phpgw_qmailldap' => array(
                        'fd' => array(
-                               'id' => array('type' => 'auto', 'nullable' => 
false),
+                               'id' => array('type' => 'auto', 'nullable' => 
False),
                                'qmail_servername' => array('type' => 
'varchar', 'precision' => 50),
                                'qmail_dn' => array('type' => 'varchar', 
'precision' => 200),
                                'use_default_ldap_server' => array('type' => 
'int', 'precision' => 2),

====================================================
Index: qmailldap/setup/setup.inc.php
diff -u qmailldap/setup/setup.inc.php:1.8 qmailldap/setup/setup.inc.php:1.9
--- qmailldap/setup/setup.inc.php:1.8   Mon Jan 17 14:36:54 2005
+++ qmailldap/setup/setup.inc.php       Mon Mar 14 12:03:10 2005
@@ -12,11 +12,13 @@
        
\**************************************************************************/
        /* $Id$ */

-       $setup_info['qmailldap']['name']      = 'qmailldap';
-       $setup_info['qmailldap']['version']   = '0.0.3';
-       $setup_info['qmailldap']['app_order'] = 99;
-       $setup_info['qmailldap']['tables']    = array('phpgw_qmailldap');
-       $setup_info['qmailldap']['enable']    = 1;
+       $setup_info['qmailldap']['name']                        = 'qmailldap';
+       $setup_info['qmailldap']['title']                       = 'QMailLDAP';
+       $setup_info['qmailldap']['version']                     = '0.0.3';
+       $setup_info['qmailldap']['app_order']           = 99;
+       $setup_info['qmailldap']['tables']                      = 
array('phpgw_qmailldap');
+       $setup_info['qmailldap']['enable']                      = 1;
+       $setup_info['qmailldap']['globals_checked']     = True;

        /* The hooks this app includes, needed for hooks registration */
        $setup_info['qmailldap']['hooks'] = array
@@ -24,14 +26,13 @@
                'preferences',
                'manual',
                'edit_user',
-               'admin',
-               'about'
+               'about',
+               'admin'
        );

-       /* Dependencies for this app to work */
-       $setup_info['qmailldap']['depends'][] = array
-       (
+       /* Dependacies for this app to work */
+       $setup_info['qmailldap']['depends'][] = array(
                'appname'  => 'phpgwapi',
-               'versions' => Array('0.9.17')
+               'versions' => Array('0.9.16','0.9.17')
        );
 ?>

====================================================
Index: qmailldap/setup/phpgw_ja.lang
diff -u qmailldap/setup/phpgw_ja.lang:1.2 qmailldap/setup/phpgw_ja.lang:1.3
--- qmailldap/setup/phpgw_ja.lang:1.2   Mon Jan 17 14:38:03 2005
+++ qmailldap/setup/phpgw_ja.lang       Mon Mar 14 12:03:10 2005
@@ -14,7 +14,7 @@
 edit email settings    qmailldap       ja
 email account active   qmailldap       ja
 email address  qmailldap       ja      ¥á¡¼¥ë¥¢¥É¥ì¥¹
-email settings admin   ja
+email settings common  ja
 forward also to        qmailldap       ja
 forward email's to     qmailldap       ja
 ldap server    qmailldap       ja      LDAP¥µ¡¼¥Ð¡¼

====================================================
Index: qmailldap/setup/phpgw_fr.lang
diff -u qmailldap/setup/phpgw_fr.lang:1.5 qmailldap/setup/phpgw_fr.lang:1.6
--- qmailldap/setup/phpgw_fr.lang:1.5   Mon Jan 17 14:36:54 2005
+++ qmailldap/setup/phpgw_fr.lang       Mon Mar 14 12:03:10 2005
@@ -14,7 +14,7 @@
 edit email settings    qmailldap       fr      Modifier les réglages d'EMail
 email account active   qmailldap       fr      Compte EMail actif
 email address  qmailldap       fr      Adresse EMail
-email settings admin   fr      Réglages EMail
+email settings common  fr      Réglages EMail
 forward also to        qmailldap       fr      faire suivre aussi à
 forward email's to     qmailldap       fr      Faire suivre l'EMail à
 forward emails to      qmailldap       fr      Faire suivre les EMails à

====================================================

====================================================
Index: qmailldap/setup/phpgw_en.lang
diff -u qmailldap/setup/phpgw_en.lang:1.6 qmailldap/setup/phpgw_en.lang:1.7
--- qmailldap/setup/phpgw_en.lang:1.6   Mon Jan 17 14:36:54 2005
+++ qmailldap/setup/phpgw_en.lang       Mon Mar 14 12:03:10 2005
@@ -5,6 +5,7 @@
 admin password qmailldap       en      Admin Password
 advanced options       qmailldap       en      advanced options
 alternate email address        qmailldap       en      Alternate Email Address
+attribute names        admin   en      attribute names
 back   common  en      Back
 default        qmailldap       en      default
 deliver extern qmailldap       en      deliver extern
@@ -14,17 +15,20 @@
 edit email settings    qmailldap       en      edit email settings
 email account active   qmailldap       en      Email account active
 email address  qmailldap       en      Email Address
-email settings admin   en      Email Settings
+email settings common  en      Email Settings
 forward also to        qmailldap       en      forward also to
 forward email's to     qmailldap       en      forward email's to
 forward emails to      qmailldap       en      forward emails to
+forwarding address     admin   en      Forwarding address
 ldap server    qmailldap       en      LDAP Server
 ldap settings  qmailldap       en      LDAP Settings
+mail address   admin   en      Mail address
 no alternate email address     qmailldap       en      No Alternate Email 
Address
 options        common  en      Options
 qmail dn       qmailldap       en      QMail DN
 qmaildotmode   qmailldap       en      qmaildotmode
 qmailldap      common  en      QMailLDAP
+qmail ldap schema      admin   en      QMailLDAP schema
 remote port    qmailldap       en      Remote Port
 remote server  qmailldap       en      Remote Server
 remove qmailldap       en      Remove

====================================================
Index: qmailldap/setup/phpgw_de.lang
diff -u qmailldap/setup/phpgw_de.lang:1.12 qmailldap/setup/phpgw_de.lang:1.13
--- qmailldap/setup/phpgw_de.lang:1.12  Mon Jan 17 14:36:54 2005
+++ qmailldap/setup/phpgw_de.lang       Mon Mar 14 12:03:10 2005
@@ -1,4 +1,3 @@
-email settings admin   de      EMailkonto
 remove qmailldap       de      Entfernen
 server list    qmailldap       de      Serverliste
 server name    qmailldap       de      Servername
@@ -10,7 +9,7 @@
 admin password qmailldap       de      Admin Passwort
 qmail dn       qmailldap       de      QMail DN
 userdata       qmailldap       de      Benutzerkonto
-email settings qmailldap       de      EMailkonto
+email settings common  de      EMailkonto
 We don't accept any email!     qmailldap       de      Es werden keine EMail's 
aktzeptiert!
 add also to local domains      qmailldap       de      auch zu den lokalen 
Domänen hinzufügen
 We don't deliver any email local!      qmailldap       de      Es werden keine 
EMail's lokal ausgeliefert!