replace the crap

setup/doc/setup3.rtf

@@ -5,12 +5,12 @@
 }
 {\colortbl;}{\stylesheet{\s1 Heading 1;}{\s2 Heading 2;}{\s3 Heading 3;}{\s4 Heading 4;}{\s5 Heading 5;}{\s6 Heading 6;}{\s7 Heading 7;}{\s8 Heading 8;}{\s9 Heading 9;}}
 \deflang1024\notabind\facingp\hyphauto1\widowctrl
-\sectd\plain\pgwsxn12240\pghsxn15840\marglsxn1440\margrsxn1440\margtsxn1440\margbsxn1920\headery0\footery0\pgndec\titlepg{\headerf\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {}\par}{\footerf\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}{\headerl\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 phpGroupWare Setup III}\par}{\footerl\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}{\headerr\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 phpGroupWare Setup III}\par}{\footerr\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}\pard\sb373\li960\sl647\qc \b\fs49\f1 phpGroupWare Setup III\keepn\hyphpar0\par\pard\sb216\li960\sl449\qc \fs34 Miles Lott\keepn\hyphpar0\par\pard\sb200\li1680\ri720\sl260 \b0\fs20\lang1033\f0  A developer introduction to using the next generation setup application for phpgroupware. \hyphpar0\par\pard\sb259\s2\sl449 \b\fs34\lang1024\f1 1. Introduction\keepn\hyphpar0\par\pard\sb216\s3\sl374 \fs28 1.1. Welcome\keepn\hyphpar0\par\pard\sb144\li960\sl260 \b0\fs20\lang1033\f0  Thanks for taking the time to look over this document. If you are a developer who is new to phpgroupware, this document will be invaluable to your success during the life of your application. This is in addition to the other fine documentation available in the phpgwapi/doc directory in your install. Even long-time phpgw developers should benefit this document. Herein, I will attempt to outline the critical steps required in order to get along with setup3, setup-TNG, or whatever we end up calling it (Hey, how about 'setup'?) \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 1.2. Overview\keepn\hyphpar0\par\pard\sb144\li960\sl260 \b0\fs20\lang1033\f0  With setup3, we introduce several new capabilities and technologies for the developer and end user alike. Michael Dean was kind enough to offer up schema_proc to form the core of an abstracted and database-independent upgrade process. This enables developers to write a single set of upgrades and table definitions, which should then work on MySQL and PostgreSQL, or any other database type we might add in the future. \hyphpar0\par\pard\sb100\li960\sl260  Adding to this to control the process was a good chunk of the old setup program, written by Dan Kuykendall (Seek3r). Dan had everything to do with the new dependencies support and with the format of the $setup_info array in setup3. \hyphpar0\par\pard\sb100\li960\sl260  Setup3 adds multi-language support for the setup application, a long missed feature, I would imagine. \hyphpar0\par\pard\sb100\li960\sl260  Setup3 gives each application developer control over their application install and upgrade processes, while giving them access to work within a realm formerly owned by only the former core phpgroupware applications. Yes, this is extra work for the developer. But it is hoped that setup3 is also viewed as a tool that can truly enhance the development process. \hyphpar0\par\pard\sb100\li960\sl260  OK. Let's dive right in... \hyphpar0\par\pard\sb259\s2\sl449 \b\fs34\lang1024\f1 2. Application setup files\keepn\hyphpar0\par\pard\sb173\li960\sl260 \b0\fs20\lang1033\f0  The files in this section are contained within each application/setup directory. Every app will some of these files in order to operate with setup3. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.1. setup.inc.php (Required)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.1.1. Basic information\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The values in this section must be used by all applications. \hyphpar0\par\pard\sb100\li960\sl260  The first section of setup.inc.php defines the very basic and yet critical information about the application. Take a look at the following section: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $setup_info['addressbook']['name'] = 'addressbook';\sa0\par\fi0\sb0
+\sectd\plain\pgwsxn12240\pghsxn15840\marglsxn1440\margrsxn1440\margtsxn1440\margbsxn1920\headery0\footery0\pgndec\titlepg{\headerf\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {}\par}{\footerf\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}{\headerl\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 phpGroupWare Setup III}\par}{\footerl\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}{\headerr\pard\sl-240\sb770\sa430\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 phpGroupWare Setup III}\par}{\footerr\pard\sl-240\sb770\sa910\plain\tqc\tx4680\tqr\tx9360 {}\tab {}\tab {\i\fs20 \chpgn }\par}\pard\sb373\li960\sl647\qc \b\fs49\f1 phpGroupWare Setup III\keepn\hyphpar0\par\pard\sb216\li960\sl449\qc \fs34 Miles Lott\keepn\hyphpar0\par\pard\sb200\li1680\ri720\sl260 \b0\fs20\lang1033\f0  A developer introduction to using the next generation setup application for egroupware. \hyphpar0\par\pard\sb259\s2\sl449 \b\fs34\lang1024\f1 1. Introduction\keepn\hyphpar0\par\pard\sb216\s3\sl374 \fs28 1.1. Welcome\keepn\hyphpar0\par\pard\sb144\li960\sl260 \b0\fs20\lang1033\f0  Thanks for taking the time to look over this document. If you are a developer who is new to egroupware, this document will be invaluable to your success during the life of your application. This is in addition to the other fine documentation available in the phpgwapi/doc directory in your install. Even long-time phpgw developers should benefit this document. Herein, I will attempt to outline the critical steps required in order to get along with setup3, setup-TNG, or whatever we end up calling it (Hey, how about 'setup'?) \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 1.2. Overview\keepn\hyphpar0\par\pard\sb144\li960\sl260 \b0\fs20\lang1033\f0  With setup3, we introduce several new capabilities and technologies for the developer and end user alike. Michael Dean was kind enough to offer up schema_proc to form the core of an abstracted and database-independent upgrade process. This enables developers to write a single set of upgrades and table definitions, which should then work on MySQL and PostgreSQL, or any other database type we might add in the future. \hyphpar0\par\pard\sb100\li960\sl260  Adding to this to control the process was a good chunk of the old setup program, written by Dan Kuykendall (Seek3r). Dan had everything to do with the new dependencies support and with the format of the $setup_info array in setup3. \hyphpar0\par\pard\sb100\li960\sl260  Setup3 adds multi-language support for the setup application, a long missed feature, I would imagine. \hyphpar0\par\pard\sb100\li960\sl260  Setup3 gives each application developer control over their application install and upgrade processes, while giving them access to work within a realm formerly owned by only the former core egroupware applications. Yes, this is extra work for the developer. But it is hoped that setup3 is also viewed as a tool that can truly enhance the development process. \hyphpar0\par\pard\sb100\li960\sl260  OK. Let's dive right in... \hyphpar0\par\pard\sb259\s2\sl449 \b\fs34\lang1024\f1 2. Application setup files\keepn\hyphpar0\par\pard\sb173\li960\sl260 \b0\fs20\lang1033\f0  The files in this section are contained within each application/setup directory. Every app will some of these files in order to operate with setup3. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.1. setup.inc.php (Required)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.1.1. Basic information\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The values in this section must be used by all applications. \hyphpar0\par\pard\sb100\li960\sl260  The first section of setup.inc.php defines the very basic and yet critical information about the application. Take a look at the following section: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $setup_info['addressbook']['name'] = 'addressbook';\sa0\par\fi0\sb0
 $setup_info['addressbook']['title'] = 'Addressbook';\sa0\par\fi0\sb0
 $setup_info['addressbook']['version'] = '0.9.13.002';\sa0\par\fi0\sb0
 $setup_info['addressbook']['app_order'] = 4;\sa0\par\fi0\sb0
 $setup_info['addressbook']['enable'] = 1;\sa0\par\fi0\sb0
-    \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  'name' is used throughout phpgroupware, typically in $phpgw_info flags such as 'currentapp' or as the 'app_name' almost everywhere else. \hyphpar0\par\pard\sb100\li960\sl260  'title' would be used in the navbar, admin, preferences, as well as in the application itself. \hyphpar0\par\pard\sb100\li960\sl260  The 'version' string defines the version of the application and table code. This would be incremented whenever you create a new upgrade function, and typically only for table modifications. If the change is significant from the last code update, you could increment this here also. Incrementing this version string is not trivial, so please do read the rest of this document for more information about that. \hyphpar0\par\pard\sb100\li960\sl260  'app_order' determines the order of applications in the navbar. If the number you set here is the same as is set for another app, the app whose 'name' is first in the English alphabet would appear first. Smaller numbers show closer to the top or left end of the navbar, depending upon the layout. \hyphpar0\par\pard\sb100\li960\sl260  The 'enable' string is used by the phpgroupware API to determine whether an application is disabled, enabled, or enabled but hidden from the navbar. Most applications will want this set to a value of 1 (enabled). The notifywindow app sets this to 2, which keeps it off the navbar. An enable of 0 would disable the app by default. There is one other special case, 3, which is used primarily by the API itself. From the perspective of setup3, the API is an application just like any other application. By setting the 'enable' flag to 3, the API is still enabled, but will not be assignable to a user as a real application. It will thereby be hidden from the admin for application and user/group editing. \hyphpar0\par\pard\sb200\s4\li960\sl312 \b\fs24\lang1024\f1 2.1.2. Table info\keepn\hyphpar0\par\pard\sb200\s5\li960\sl260 \fs20 2.1.2.1. Only applications with database tables will use entries in this section.\keepn\hyphpar0\par\pard\sb100\li960\sl260 \b0\lang1033\f0  The next section of $setup_info values is an array defining all of the application's database tables: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $setup_info['addressbook']['tables'] = array(\sa0\par\fi0\sb0
+    \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  'name' is used throughout egroupware, typically in $phpgw_info flags such as 'currentapp' or as the 'app_name' almost everywhere else. \hyphpar0\par\pard\sb100\li960\sl260  'title' would be used in the navbar, admin, preferences, as well as in the application itself. \hyphpar0\par\pard\sb100\li960\sl260  The 'version' string defines the version of the application and table code. This would be incremented whenever you create a new upgrade function, and typically only for table modifications. If the change is significant from the last code update, you could increment this here also. Incrementing this version string is not trivial, so please do read the rest of this document for more information about that. \hyphpar0\par\pard\sb100\li960\sl260  'app_order' determines the order of applications in the navbar. If the number you set here is the same as is set for another app, the app whose 'name' is first in the English alphabet would appear first. Smaller numbers show closer to the top or left end of the navbar, depending upon the layout. \hyphpar0\par\pard\sb100\li960\sl260  The 'enable' string is used by the egroupware API to determine whether an application is disabled, enabled, or enabled but hidden from the navbar. Most applications will want this set to a value of 1 (enabled). The notifywindow app sets this to 2, which keeps it off the navbar. An enable of 0 would disable the app by default. There is one other special case, 3, which is used primarily by the API itself. From the perspective of setup3, the API is an application just like any other application. By setting the 'enable' flag to 3, the API is still enabled, but will not be assignable to a user as a real application. It will thereby be hidden from the admin for application and user/group editing. \hyphpar0\par\pard\sb200\s4\li960\sl312 \b\fs24\lang1024\f1 2.1.2. Table info\keepn\hyphpar0\par\pard\sb200\s5\li960\sl260 \fs20 2.1.2.1. Only applications with database tables will use entries in this section.\keepn\hyphpar0\par\pard\sb100\li960\sl260 \b0\lang1033\f0  The next section of $setup_info values is an array defining all of the application's database tables: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $setup_info['addressbook']['tables'] = array(\sa0\par\fi0\sb0
     'phpgw_addressbook',\sa0\par\fi0\sb0
     'phpgw_addressbook_extra'\sa0\par\fi0\sb0
 );\sa0\par\fi0\sb0
@@ -25,7 +25,7 @@ $setup_info['addressbook']['hooks'][] = 'admin';\sa0\par\fi0\sb0
         '0.9.13'\sa0\par\fi0\sb0
     ) \sa0\par\fi0\sb0
 );\sa0\par\fi0\sb0
-     \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  This is the standard dependency array for all phpgroupware applications. It states that this application requires the phpgwapi, and lists the versions with which versions this app is compatible. This list would need to be appended upon each new API release, assuming your application is compatible with this new API version. You may list other applications here, e.g. your app might depend upon 'email' in order to work properly. \hyphpar0\par\pard\sb100\li960\sl260  Do NOT list applications here without considering this: If you do list an application here, and your app does not really require it, your application will not install unless that other application is already installed. This is handled normally within the install/upgrade process loops, which will install only applications whose dependencies are satisfied. Using a multipass function, the applications are installed in the correct order to ensure that dependencies are resolved. In all cases, the API would be installed first in every new install or upgrade, since all applications depend on the API. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.2. tables_baseline.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.2.1. Any application that has at least one upgrade routine will have this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The tables_baseline file represents the earliest supported version of an application's tables. This file is used only in the upgrade process, and is critical to its success. It contains an array of database-independent table, field, key and index definitions. \hyphpar0\par\pard\sb100\li960\sl260  This array is formatted for use by the class.schema_proc_array.inc.php file in setup3. See the tables_update section below for more detail about schema_proc, but for now, here is a simple table definition in this format: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $phpgw_baseline = array(\sa0\par\fi0\sb0
+     \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  This is the standard dependency array for all egroupware applications. It states that this application requires the phpgwapi, and lists the versions with which versions this app is compatible. This list would need to be appended upon each new API release, assuming your application is compatible with this new API version. You may list other applications here, e.g. your app might depend upon 'email' in order to work properly. \hyphpar0\par\pard\sb100\li960\sl260  Do NOT list applications here without considering this: If you do list an application here, and your app does not really require it, your application will not install unless that other application is already installed. This is handled normally within the install/upgrade process loops, which will install only applications whose dependencies are satisfied. Using a multipass function, the applications are installed in the correct order to ensure that dependencies are resolved. In all cases, the API would be installed first in every new install or upgrade, since all applications depend on the API. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.2. tables_baseline.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.2.1. Any application that has at least one upgrade routine will have this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The tables_baseline file represents the earliest supported version of an application's tables. This file is used only in the upgrade process, and is critical to its success. It contains an array of database-independent table, field, key and index definitions. \hyphpar0\par\pard\sb100\li960\sl260  This array is formatted for use by the class.schema_proc_array.inc.php file in setup3. See the tables_update section below for more detail about schema_proc, but for now, here is a simple table definition in this format: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $phpgw_baseline = array(\sa0\par\fi0\sb0
     'skel' => array(\sa0\par\fi0\sb0
         'fd' => array(\sa0\par\fi0\sb0
             'skel_id' => array('type' => 'auto','nullable' => false),\sa0\par\fi0\sb0
@@ -41,7 +41,7 @@ $setup_info['addressbook']['hooks'][] = 'admin';\sa0\par\fi0\sb0
         'uc' => array()\sa0\par\fi0\sb0
     ) \sa0\par\fi0\sb0
 );\sa0\par\fi0\sb0
-    \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  This multi-dimensional array contains 1 subarray with 5 subs of its own. The first array ('skel' above) defines the table name. Below that are 5 sections, 'fd' for field definitions, 'pk' to define primary keys, 'fk' to define foreign keys, 'ix' to define indexed fields, and 'uc' to define columns that require unique values. In the above example, the table 'skel' has 6 fields (skel_id, skel_owner, skel_access, skel_cat, skel_des, skel_pri), and 'skel_id' is defined also as the primary key for this table. More information on this array is below. But, this format was chosen as an available solution for defining tables and fields without having to maintain seperate files for different databases. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.3. tables_current.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.3.1. All applications with tables will need this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The tables_current file defines the current table definition that matches the 'version' string in $setup_info as well as the current code. This file is used only for new installs, or whenever the application is removed and reinstalled. The format and name of the array in this file is the same as for the tables_baseline file listed above. In fact, whenever it is required to change your table definitions, you would start by copying the current file over to become the tables_baseline file. After having created your upgrade routines, you would then recreate the current file to match the new table definitions. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.4. tables_update.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.4.1. Any application which requires an upgrade to a previous version's tables will need this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  This file will be the most complex of all setup-oriented files with which you will be working. It will contain all upgrade functions capable of upgrading any possible version of your phpgroupware app. These upgrade routines roughly match the old setup program's upgrade functions, but the use of objects and the methods have changed dramatically. The simplest version upgrade routine would look like: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $test[] = "0.9.3pre10";\sa0\par\fi0\sb0
+    \hyphpar0\par\pard\sb200\li960\sl260 \fs20\lang1033\f0  This multi-dimensional array contains 1 subarray with 5 subs of its own. The first array ('skel' above) defines the table name. Below that are 5 sections, 'fd' for field definitions, 'pk' to define primary keys, 'fk' to define foreign keys, 'ix' to define indexed fields, and 'uc' to define columns that require unique values. In the above example, the table 'skel' has 6 fields (skel_id, skel_owner, skel_access, skel_cat, skel_des, skel_pri), and 'skel_id' is defined also as the primary key for this table. More information on this array is below. But, this format was chosen as an available solution for defining tables and fields without having to maintain seperate files for different databases. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.3. tables_current.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.3.1. All applications with tables will need this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  The tables_current file defines the current table definition that matches the 'version' string in $setup_info as well as the current code. This file is used only for new installs, or whenever the application is removed and reinstalled. The format and name of the array in this file is the same as for the tables_baseline file listed above. In fact, whenever it is required to change your table definitions, you would start by copying the current file over to become the tables_baseline file. After having created your upgrade routines, you would then recreate the current file to match the new table definitions. \hyphpar0\par\pard\sb216\s3\sl374 \b\fs28\lang1024\f1 2.4. tables_update.inc.php (Recommended)\keepn\hyphpar0\par\pard\sb200\s4\li960\sl312 \fs24 2.4.1. Any application which requires an upgrade to a previous version's tables will need this file.\keepn\hyphpar0\par\pard\sb120\li960\sl260 \b0\fs20\lang1033\f0  This file will be the most complex of all setup-oriented files with which you will be working. It will contain all upgrade functions capable of upgrading any possible version of your egroupware app. These upgrade routines roughly match the old setup program's upgrade functions, but the use of objects and the methods have changed dramatically. The simplest version upgrade routine would look like: \hyphpar0\par\pard\sb200\li960\sl234 \fs18\lang1024\f2 $test[] = "0.9.3pre10";\sa0\par\fi0\sb0
 function addressbook_upgrade0_9_3pre10()\sa0\par\fi0\sb0
 \{\sa0\par\fi0\sb0
     global $setup_info;\sa0\par\fi0\sb0

setup/lang/phpgw_es-ca.lang

@@ -145,7 +145,6 @@ enter your http proxy server port	setup	es-ca	Introdu
 enter your http proxy server username	setup	es-ca	Introduïu el nom d'usuari del vostre servidor proxy HTTP
 export egroupware accounts from sql to ldap	setup	es-ca	Exportar comptes d'eGroupWare de SQL a LDAP
 export has been completed!  you will need to set the user passwords manually.	setup	es-ca	Exportació acabada. Necessitareu establir les contrasenyes dels usuaris manualment.
-export phpgroupware accounts from sql to ldap	setup	es-ca	Exportar las cuentas de eGroupWare de SQL a LDAP
 export sql users to ldap	setup	es-ca	Exportar usuaris SQL a LDAP
 file	setup	es-ca	ARXIU
 file type, size, version, etc.	setup	es-ca	tipus d'arxiu, tamany, versió, etc

setup/lang/phpgw_es-es.lang

@@ -159,7 +159,6 @@ error in admin-creation !!!	setup	es-es	Error al crear administrador
 error in group-creation !!!	setup	es-es	Error al crear grupo
 export egroupware accounts from sql to ldap	setup	es-es	Exportar cuentas de eGroupWare de SQL a LDAP
 export has been completed!  you will need to set the user passwords manually.	setup	es-es	Se ha completado la exportación. Necesitará poner la contraseña del usuario manualmente.
-export phpgroupware accounts from sql to ldap	setup	es-es	Exportar las cuentas de eGroupWare de SQL a LDAP
 export sql users to ldap	setup	es-es	Exportar usuarios SQL a LDAP
 false	setup	es-es	Falso
 file	setup	es-es	FICHERO

setup/lang/phpgw_zh.lang

@@ -132,7 +132,7 @@ enter your http proxy server password	setup	zh	TTP代理服务器的密码
 enter your http proxy server port	setup	zh	HTTP代理服务器的端口号
 enter your http proxy server username	setup	zh	HTTP代理服务器的用户名
 export has been completed!  you will need to set the user passwords manually.	setup	zh	导出完成!  您必须手动设置用户的密码.
-export phpgroupware accounts from sql to ldap	setup	zh	将现存于 SQL 中的 phpGroupWare 帐户资料导出至 LDAP
+export egroupware accounts from sql to ldap	setup	zh	将现存于 SQL 中的 eGroupWare 帐户资料导出至 LDAP
 export sql users to ldap	setup	zh	将 SQL 的用户资料导出至 LDAP
 file	setup	zh	文件
 file type, size, version, etc.	setup	zh	文件类型、大小、版本, 等等.
@@ -395,4 +395,4 @@ your header.inc.php needs upgrading.	setup	zh	您的 header.inc.php 需要升级
 your header.inc.php needs upgrading.<br><blink><b class="msg">warning!</b></blink><br><b>make backups!</b>	setup	zh	您的header.inc.php需要升级.<br><blink><b class="msg">警告!</b></blink><br><b>请做备份!</b>
 your tables are current	setup	zh	您的表格是当前表格
 your tables may be altered and you may lose data	setup	zh	您的表格可能改动过.并可能丢失部分数据
-your tables will be dropped and you will lose data	setup	zh	您的表格将被移除，数据也会全部丢失
+your tables will be dropped and you will lose data	setup	zh	您的表格将被移除，数据也会全部丢失