From 49abce8235c23b8e87cccb9a47f7ea10068c9974 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 11 Apr 2018 15:13:21 +0200 Subject: [PATCH] Fix wrongly spelled EGroupware name --- setup/account_migration.php | 2 +- setup/admin_account.php | 2 +- setup/check_install.php | 26 ++++++------ setup/db_backup.php | 2 +- setup/doc/setup3-1.html | 8 ++-- setup/doc/setup3-2.html | 4 +- setup/doc/setup3-3.html | 4 +- setup/doc/setup3-4.html | 4 +- setup/doc/setup3.html | 4 +- setup/doc/setup3.lyx | 2 +- setup/doc/setup3.sgml | 2 +- setup/doc/setup3.txt | 2 +- setup/fix_mysql_charset.php | 6 +-- setup/inc/class.setup_cmd.inc.php | 8 ++-- setup/inc/class.setup_cmd_admin.inc.php | 6 +-- setup/inc/class.setup_cmd_config.inc.php | 4 +- setup/inc/class.setup_cmd_install.inc.php | 2 +- setup/inc/class.setup_cmd_ldap.inc.php | 2 +- setup/inc/class.setup_detection.inc.php | 2 +- setup/inc/class.setup_header.inc.php | 6 +-- setup/inc/class.setup_process.inc.php | 2 +- setup/index.php | 10 ++--- setup/lang/egw_ca.lang | 10 ++--- setup/lang/egw_cs.lang | 10 ++--- setup/lang/egw_de.lang | 8 ++-- setup/lang/egw_en.lang | 10 ++--- setup/lang/egw_es-es.lang | 10 ++--- setup/lang/egw_fi.lang | 8 ++-- setup/lang/egw_fr.lang | 4 +- setup/lang/egw_hr.lang | 4 +- setup/lang/egw_it.lang | 2 +- setup/lang/egw_iw.lang | 2 +- setup/lang/egw_lv.lang | 2 +- setup/lang/egw_nl.lang | 8 ++-- setup/lang/egw_no.lang | 8 ++-- setup/lang/egw_pl.lang | 48 +++++++++++------------ setup/lang/egw_pt-br.lang | 6 +-- setup/lang/egw_pt.lang | 2 +- setup/lang/egw_ru.lang | 8 ++-- setup/lang/egw_sk.lang | 10 ++--- setup/lang/egw_sl.lang | 20 +++++----- setup/lang/egw_sv.lang | 10 ++--- setup/lang/egw_zh-tw.lang | 4 +- setup/lang/egw_zh.lang | 6 +-- setup/manageheader.php | 20 +++++----- setup/schematoy.php | 2 +- setup/setup-cli.php | 6 +-- setup/templates/default/arraydl.tpl | 2 +- setup/templates/default/config.tpl | 2 +- setup/templates/default/head.tpl | 2 +- 50 files changed, 172 insertions(+), 172 deletions(-) diff --git a/setup/account_migration.php b/setup/account_migration.php index 626232a86b..6c6d1770f4 100644 --- a/setup/account_migration.php +++ b/setup/account_migration.php @@ -2,7 +2,7 @@ /** * EGroupware Setup - Account migration between SQL <--> LDAP * - * The migration is done to the account-repository configured for eGroupWare! + * The migration is done to the account-repository configured for EGroupware! * * @link http://www.egroupware.org * @package setup diff --git a/setup/admin_account.php b/setup/admin_account.php index d582f043aa..eed452648b 100644 --- a/setup/admin_account.php +++ b/setup/admin_account.php @@ -77,7 +77,7 @@ if(!$_POST['submit'] || $error) 'email' => $email, )); $setup_tpl->set_var('action_url','admin_account.php'); - $setup_tpl->set_var('description',lang('This will create a first user in eGroupWare or reset password and admin rights of an exiting user')); + $setup_tpl->set_var('description',lang('This will create a first user in EGroupware or reset password and admin rights of an exiting user')); $setup_tpl->set_var('lang_deleteall',lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?')); $setup_tpl->set_var('detailadmin',lang('Details for Admin account')); diff --git a/setup/check_install.php b/setup/check_install.php index 2e35f6e643..19ea7d7c4d 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -1,6 +1,6 @@ 0, 'verbose_value' => 'Off', 'warning' => lang('safe_mode is turned on, which is generaly a good thing as it makes your install more secure.')."\n". - lang('If safe_mode is turned on, eGW is not able to change certain settings on runtime, nor can we load any not yet loaded module.')."\n". - lang('*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get eGW fully working !!!')."\n". + lang('If safe_mode is turned on, EGw is not able to change certain settings on runtime, nor can we load any not yet loaded module.')."\n". + lang('*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get EGw fully working !!!')."\n". lang('*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!') ), 'magic_quotes_runtime' => array( @@ -73,7 +73,7 @@ $checks = array( 'func' => 'php_ini_check', 'value' => 0, 'verbose_value' => 'Off', - 'warning' => lang("register_globals is turned On, eGroupWare does NOT require it and it's generaly more secure to have it turned Off") + 'warning' => lang("register_globals is turned On, EGroupware does NOT require it and it's generaly more secure to have it turned Off") ), 'display_errors' => array( 'func' => 'php_ini_check', @@ -85,14 +85,14 @@ $checks = array( 'func' => 'php_ini_check', 'value' => '128M', 'check' => '>=', - 'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures','24M'), + 'error' => lang('memory_limit is set to less than %1: some applications of EGroupware need more than the recommend 8M, expect occasional failures','24M'), 'change' => 'memory_limit = 24M' ), 'max_execution_time' => array( 'func' => 'php_ini_check', 'value' => 30, 'check' => '>=', - 'error' => lang('max_execution_time is set to less than 30 (seconds): eGroupWare sometimes needs a higher execution_time, expect occasional failures'), + 'error' => lang('max_execution_time is set to less than 30 (seconds): EGroupware sometimes needs a higher execution_time, expect occasional failures'), 'safe_mode' => 'max_execution_time = 30' ), 'file_uploads' => array( @@ -252,7 +252,7 @@ if (extension_loaded('session') && ini_get('session.save_handler') == 'files' && 'func' => 'permission_check', 'is_writable' => true, 'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()), - 'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'), + 'error' => lang('You will NOT be able to log into EGroupware using PHP sessions: "session could not be verified" !!!'), ); } } @@ -857,27 +857,27 @@ if ($run_by_webserver) { $GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/'); } - $GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'),False,'config'); - echo '

'.lang('Welcome to the eGroupWare Installation')."

\n"; + $GLOBALS['egw_setup']->html->show_header(lang('Welcome to the EGroupware Installation'),False,'config'); + echo '

'.lang('Welcome to the EGroupware Installation')."

\n"; if(!$ConfigLang) { echo '

Please Select your language '.setup_html::lang_select(True,'en')."

\n"; } - echo '

'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'

'; + echo '

'.lang('The first step in installing EGroupware is to ensure your environment has the necessary settings to correctly run the application.').'

'; echo '

'.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.').'

'; echo '

'.lang('Run installation tests').'

'; echo '

'.lang('Skip the installation tests (not recommended)')."

\n"; $setup_tpl->pparse('out','T_footer'); exit; } else { - $GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : ''); - echo '

'.lang('Checking the eGroupWare Installation')."

\n"; + $GLOBALS['egw_setup']->html->show_header(lang('Checking the EGroupware Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : ''); + echo '

'.lang('Checking the EGroupware Installation')."

\n"; # echo "
\n";;
 	}
 }
 else
 {
-	echo "Checking the eGroupWare Installation\n";
+	echo "Checking the EGroupware Installation\n";
 	echo "====================================\n\n";
 }
 
diff --git a/setup/db_backup.php b/setup/db_backup.php
index 02abd5d0e9..b8b99cbc4e 100644
--- a/setup/db_backup.php
+++ b/setup/db_backup.php
@@ -14,7 +14,7 @@ use EGroupware\Api\Framework;
 use EGroupware\Api\Egw;
 use EGroupware\Api\Vfs;
 
-if (!is_object(@$GLOBALS['egw']))	// called from outside eGW ==> setup
+if (!is_object(@$GLOBALS['egw']))	// called from outside EGw ==> setup
 {
 	include ('./inc/functions.inc.php');
 
diff --git a/setup/doc/setup3-1.html b/setup/doc/setup3-1.html
index 601100c0d9..70f989a21c 100644
--- a/setup/doc/setup3-1.html
+++ b/setup/doc/setup3-1.html
@@ -7,11 +7,11 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.59">eGroupWare SetupEGroupware SetupeGroupWare SetupEGroupware SetupeGroupWare SetupEGroupware SetupeGroupWare SetupEGroupware SetupeGroupWare SetupEGroupware Setup   eGroupWare Setup
+>   EGroupware Setup
   eGroupWare SetupEGroupware Setup

   
    
-   eGroupWare Setup
+   EGroupware Setup
   
   
    June 18, 2001 
diff --git a/setup/doc/setup3.txt b/setup/doc/setup3.txt
index 7839c3c6f3..85261afba8 100644
--- a/setup/doc/setup3.txt
+++ b/setup/doc/setup3.txt
@@ -1,6 +1,6 @@
 
 
-eGroupWare Setup
+EGroupware Setup
 
 June 18, 2001 
 Updated May 9, 2003
diff --git a/setup/fix_mysql_charset.php b/setup/fix_mysql_charset.php
index 09f57398e2..d10402ab43 100644
--- a/setup/fix_mysql_charset.php
+++ b/setup/fix_mysql_charset.php
@@ -1,6 +1,6 @@
  'footer.tpl',
 	));
 	$GLOBALS['egw_setup']->html->show_header('',False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
-	echo '
'.'Fix mysql DB to match the eGroupWare system_charset'."
\n";
+	echo '
'.'Fix mysql DB to match the EGroupware system_charset'."
\n";
 	$running_standalone = true;
 }
 $db =& $GLOBALS['egw_setup']->db;
@@ -41,7 +41,7 @@ $mysql2charset = array_flip($charset2mysql);
 $ServerInfo = $db->Link_ID->ServerInfo();
 $db_version = (float) $ServerInfo['version'];
 
-if ($running_standalone || $_REQUEST['debug']) echo "
DB-Type='{$GLOBALS['egw_setup']->db->Type}', DB-Version=$db_version ($ServerInfo[description]), eGroupWare system_charset='{$GLOBALS['egw_setup']->system_charset}', DB-connection charset was '{$GLOBALS['egw_setup']->db_charset_was}'
\n";
+if ($running_standalone || $_REQUEST['debug']) echo "
DB-Type='{$GLOBALS['egw_setup']->db->Type}', DB-Version=$db_version ($ServerInfo[description]), EGroupware system_charset='{$GLOBALS['egw_setup']->system_charset}', DB-connection charset was '{$GLOBALS['egw_setup']->db_charset_was}'
\n";
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
diff --git a/setup/inc/class.setup_cmd.inc.php b/setup/inc/class.setup_cmd.inc.php
index 9319dd88aa..ac5c2c4e95 100644
--- a/setup/inc/class.setup_cmd.inc.php
+++ b/setup/inc/class.setup_cmd.inc.php
@@ -110,7 +110,7 @@ abstract class setup_cmd extends admin_cmd
 	static private $egw_accounts_backup;
 
 	/**
-	 * Create the setup enviroment (for running within setup or eGW)
+	 * Create the setup enviroment (for running within setup or EGw)
 	 */
 	static protected function _setup_enviroment($domain=null)
 	{
@@ -125,7 +125,7 @@ abstract class setup_cmd extends admin_cmd
 		if (isset($GLOBALS['egw_info']['server']['header_admin_user']) && !isset($GLOBALS['egw_domain']) &&
 			is_object($GLOBALS['egw']) && $GLOBALS['egw'] instanceof Egw)
 		{
-			// we run inside eGW, not setup --> read egw_domain array from the header via the showheader cmd
+			// we run inside EGw, not setup --> read egw_domain array from the header via the showheader cmd
 			$cmd = new setup_cmd_showheader(null);	// null = only header, no db stuff, no hashes
 			$header = $cmd->run();
 			$GLOBALS['egw_domain'] = $header['egw_domain'];
@@ -148,7 +148,7 @@ abstract class setup_cmd extends admin_cmd
 	}
 
 	/**
-	 * Restore eGW's db connection
+	 * Restore EGw's db connection
 	 *
 	 */
 	static function restore_db()
@@ -218,7 +218,7 @@ abstract class setup_cmd extends admin_cmd
 	static public $apps_to_upgrade=array();
 
 	/**
-	 * Check if eGW is installed, which versions and if an update is needed
+	 * Check if EGw is installed, which versions and if an update is needed
 	 *
 	 * Sets self::$apps_to_update and self::$apps_to_install for the last/only domain only!
 	 *
diff --git a/setup/inc/class.setup_cmd_admin.inc.php b/setup/inc/class.setup_cmd_admin.inc.php
index 810c2eb2da..d624fcb394 100644
--- a/setup/inc/class.setup_cmd_admin.inc.php
+++ b/setup/inc/class.setup_cmd_admin.inc.php
@@ -1,6 +1,6 @@
 
@@ -13,7 +13,7 @@
 use EGroupware\Api;
 
 /**
- * setup command: create a first eGroupWare user / admin and our two standard groups: Default & Admins
+ * setup command: create a first EGroupware user / admin and our two standard groups: Default & Admins
  *
  * @ToDo: get rid of the ugly setup_admin.php include
  */
@@ -61,7 +61,7 @@ class setup_cmd_admin extends setup_cmd
 	}
 
 	/**
-	 * run the command: create eGW admin and standard groups
+	 * run the command: create EGw admin and standard groups
 	 *
 	 * @param boolean $check_only =false only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index 9b6c025234..890accaa39 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -1,6 +1,6 @@
 
@@ -13,7 +13,7 @@
 use EGroupware\Api;
 
 /**
- * setup command: create / change eGW configuration
+ * setup command: create / change EGw configuration
  */
 class setup_cmd_config extends setup_cmd
 {
diff --git a/setup/inc/class.setup_cmd_install.inc.php b/setup/inc/class.setup_cmd_install.inc.php
index 62e421f8a7..f61c54b1f8 100644
--- a/setup/inc/class.setup_cmd_install.inc.php
+++ b/setup/inc/class.setup_cmd_install.inc.php
@@ -104,7 +104,7 @@ class setup_cmd_install extends setup_cmd
 		// regular (new) install
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 3)
 		{
-			throw new Api\Exception\WrongUserinput(lang('eGroupWare is already installed!'),30);
+			throw new Api\Exception\WrongUserinput(lang('EGroupware is already installed!'),30);
 		}
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
diff --git a/setup/inc/class.setup_cmd_ldap.inc.php b/setup/inc/class.setup_cmd_ldap.inc.php
index 0275c4d95e..5beed42ae2 100644
--- a/setup/inc/class.setup_cmd_ldap.inc.php
+++ b/setup/inc/class.setup_cmd_ldap.inc.php
@@ -807,7 +807,7 @@ class setup_cmd_ldap extends setup_cmd
 		if (is_null($pw)) $pw = $this->ldap_root_pw;
 		if (is_null($host)) $host = $this->ldap_host;
 
-		if (!$pw)	// Api\Ldap::ldapConnect use the current eGW's pw otherwise
+		if (!$pw)	// Api\Ldap::ldapConnect use the current EGw's pw otherwise
 		{
 			throw new Api\Exception\WrongUserinput(lang('You need to specify a password!'));
 		}
diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php
index b168f294d6..2132310211 100755
--- a/setup/inc/class.setup_detection.inc.php
+++ b/setup/inc/class.setup_detection.inc.php
@@ -369,7 +369,7 @@ class setup_detection
 	}
 
 	/**
-	 * Check if eGW configuration exists
+	 * Check if EGw configuration exists
 	 *
 	 * @return int 1 = Needs config, ..., 10 = Config Ok
 	 */
diff --git a/setup/inc/class.setup_header.inc.php b/setup/inc/class.setup_header.inc.php
index 2ca90ab76e..3cc2594b08 100644
--- a/setup/inc/class.setup_header.inc.php
+++ b/setup/inc/class.setup_header.inc.php
@@ -1,6 +1,6 @@
 required_php_version)
 {
 	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
 	$GLOBALS['egw_setup']->html->show_alert_msg('Error',
-		lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',
+		lang('You are using PHP version %1. EGroupware now requires %2 or later, recommended is PHP %3.',
 		PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
@@ -232,7 +232,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
 	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.
These versions are no longer supported, and there is no upgrade path for them in setup.
 You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) 
and then upgrade from there with the current version.'));
+		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of EGroupware.
These versions are no longer supported, and there is no upgrade path for them in setup.
 You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) 
and then upgrade from there with the current version.'));
 		$setup_tpl->set_var('notcomplete',lang('not complete'));
 		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
@@ -256,7 +256,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
 		break;
 	case 4:
 		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
+		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of EGroupware',
 			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
 		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
 		$setup_tpl->set_var('backupwarn',lang('but we highly recommend backing up your tables in case the script causes damage to your data.
These automated scripts can easily destroy your data.'));
@@ -389,7 +389,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
 	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+		$setup_tpl->set_var('tablescurrent',lang('Your EGroupware API is current'));
 		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
 		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
@@ -419,7 +419,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 1:	// AFAIK this dont happen any more, as we have setup_process::save_minimal_config() now -- RalfBecker
 		$btn_config_now = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
-			lang('Please configure eGroupWare for your environment'),
+			lang('Please configure EGroupware for your environment'),
 			'post','config.php',
 			'submit',lang('Configure Now'),
 			'');
diff --git a/setup/lang/egw_ca.lang b/setup/lang/egw_ca.lang
index 04ea1586be..0d3edf7226 100644
--- a/setup/lang/egw_ca.lang
+++ b/setup/lang/egw_ca.lang
@@ -7,7 +7,7 @@
 '%1' is not allowed as %2. arguments of option %3 !!!	setup	ca	'%1' no és permès com %2. arguments de l'opció %3 !!!
 (searching accounts and changing passwords)	setup	ca	(cercant comptes i canviant contrasenyes)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	ca	*** NO actualitzeu la vostra base de dades a través d'aquesta Instal·lació, perquè l'actualització pot ser interrompuda pel max_execution_time deixant la vostra base de dades en un estat irrecuperable (les vostres dades es perdran) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	ca	*** Heu de fer els canvis manualment al vostre php.ini (normalment dins /etc a linux) a fi de fer que l'eGW sigui totalment funcional !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	ca	*** Heu de fer els canvis manualment al vostre php.ini (normalment dins /etc a linux) a fi de fer que l'EGw sigui totalment funcional !!!
 00 (disable)	setup	ca	00 (desactivar / recomanat)
 13 (ntp)	setup	ca	13 (ntp)
 80 (http)	setup	ca	80 (http)
@@ -18,7 +18,7 @@ accounts existing	setup	ca	Comptes existents
 actions	setup	ca	Accions
 activate safe password check	setup	ca	Activa comprovació de contrasenya segura
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	ca	Afegir usuaris creats automàticament a aquest grup (Si es buit, serà assignat al grup 'Default')
-add new database instance (egw domain)	setup	ca	Afegeix una nova instància a la base de dades (domini eGW)
+add new database instance (egw domain)	setup	ca	Afegeix una nova instància a la base de dades (domini EGw)
 additional settings	setup	ca	Configuració addicional
 admin account successful created.	setup	ca	Compte de l'administrador creat correctament.
 admin email address	setup	ca	Adreça email de l'Administrador
@@ -147,7 +147,7 @@ current version	setup	ca	Versió Actual
 currently installed languages: %1 
	setup	ca	Idiomes instal·lats actualment: %1 

 cyrus imap: admin user,password	setup	ca	Cyrus IMAP: Usuari administrador, contrasenya
 database	setup	ca	Base de dades
-database instance (egw domain)	setup	ca	Instància de base de dades (domini eGW)
+database instance (egw domain)	setup	ca	Instància de base de dades (domini EGw)
 database is version %1 and up to date.	setup	ca	base de dades està en la versió %1 i actualitzada.
 database successfully converted from '%1' to '%2'	setup	ca	Base de dades convertida correctament de '%1' a '%2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	ca	Port data i hora.
Si utilitzes el port 13, per favor comprova les regles del firewall abans d'enviar aquesta pàgina.
(Port: 13 / Host: 129.6.15.28)
@@ -243,7 +243,7 @@ however the tables are still in the database	setup	ca	Tanmateix les taules encar
 however, the application is otherwise installed	setup	ca	Tanmateix, l'aplicació fou instal·lada
 however, the application may still work	setup	ca	Tanmateix, l'aplicació encara pot funcionar
 if no acl records for user or any group the user is a member of	setup	ca	Si no hi han registres ACL ni grup per a l'usuari, aleshores és membre de
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	ca	Si mode_segur està activat, eGW no pot canviar determinades configuracions en temps d'execució ni tampoc podem carregar cap mòdul que no estigui carregat.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	ca	Si mode_segur està activat, EGw no pot canviar determinades configuracions en temps d'execució ni tampoc podem carregar cap mòdul que no estigui carregat.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	ca	Si l'aplicació no ha definit taules, seleccionant actualitzar hauria de resoldre el problema
 if using ads (active directory)	setup	ca	Si feu servir autentificació ADS (Activer Directory)
 if using ldap	setup	ca	Si feu servir LDAP
@@ -282,7 +282,7 @@ ldap host	setup	ca	Servidor LDAP
 ldap import	setup	ca	Importació LDAP
 ldap root password	setup	ca	Contrasenya de l'administrador LDAP
 ldap rootdn	setup	ca	rootdn LDAP
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	ca	filtre de cerca LDAP per a comptes, per defecte: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	ca	filtre de cerca LDAP per a comptes, per defecte: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	ca	Deixa buit per mantenir l'actual
 limit access	setup	ca	Accés limitat
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	ca	Accés limitat a la instal·lació a les següents adreces, xarxes o màquines (ex. 127.0.0.1,10.1.1,myhost.dnydns.org)
diff --git a/setup/lang/egw_cs.lang b/setup/lang/egw_cs.lang
index 14d0fc078e..6fceedfde0 100644
--- a/setup/lang/egw_cs.lang
+++ b/setup/lang/egw_cs.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	cs	%1 musí být hodnota typu integer
 (searching accounts and changing passwords)	setup	cs	(prohledávání účtů a změna hesel)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	cs	*** Neaktualizujte Vaší databázi prostřednictvím Instalátoru, protože aktualizace by díky nastavení parametru max_execution_time mohla být přerušena a Vaše databáze by pak zůstala v neobnovitelném stavu (ztratil(a) by jste svá data) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	cs	*** Změny musíte provést ručně ve Vašem php.ini (na Linuxu obvykle v adresáři /etc), aby byl eGW plně funkční !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	cs	*** Změny musíte provést ručně ve Vašem php.ini (na Linuxu obvykle v adresáři /etc), aby byl EGw plně funkční !!!
 00 (disable)	setup	cs	00 (zakázat / doporučeno)
 13 (ntp)	setup	cs	13 (ntp)
 80 (http)	setup	cs	80 (http)
@@ -30,7 +30,7 @@ accounts existing	setup	cs	Stávající účty
 actions	setup	cs	Akce
 activate safe password check	setup	cs	Aktivovat kontrolu bezpečnosti hesla
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	cs	Přidat automaticky vytvořené uživatele do této skupiny (Ponecháte-li prázdné, zkusím skupinu 'Default'.)
-add new database instance (egw domain)	setup	cs	Přidat novou instanci databáze (eGW doménu)
+add new database instance (egw domain)	setup	cs	Přidat novou instanci databáze (EGw doménu)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	cs	přidat nebo editovat doménu:[název domény(default)],[název databáze(egroupware)],[uživatel databáze(egroupware)],heslo databáze,[typ databáze(mysql)],[databázový server(localhost)],[port databáze(db specific)],[administrátor konfigurace(jako admin. hlaviček)],[heslo administrátora konfigurace(jako admin. hlaviček)]
 adding, editing or deleting an egroupware domain / database instance:	setup	cs	Přidání, editace nebo mazání EGroupware domény / instance databáze
 additional options and there defaults (in brackets)	setup	cs	Další volby a jejich výchozí hodnoty (v závorkách)
@@ -201,7 +201,7 @@ custom handler: %1	setup	cs	Uživatelský správce: %1
 custom set via %1	setup	cs	Uživatelské nastavení přes %1
 cyrus imap: admin user,password	setup	cs	Cyrus IMAP: Uživatelské jméno administrátora, heslo
 database	setup	cs	Databáze
-database instance (egw domain)	setup	cs	Instance databáze (eGW doména)
+database instance (egw domain)	setup	cs	Instance databáze (EGw doména)
 database is version %1 and up to date.	setup	cs	databáze je verze %1 a je aktuální.
 database successfully converted from '%1' to '%2'	setup	cs	Databáze úspěšně zkonvertována z '%1' na '%2'
 datebase %1 droped.	setup	cs	Databáze %1 byla smazána.
@@ -331,7 +331,7 @@ however, the application is otherwise installed	setup	cs	Nicméně aplikace je j
 however, the application may still work	setup	cs	Nicméně aplikace stále může fungovat
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	cs	Typy HTTP autentikace (oddělené čárkami), které mají být použity bez přihlašovací stránky, např. "NTLM"
 if no acl records for user or any group the user is a member of	setup	cs	Pokud nejsou ACL záznamy pro uživatele nebo libovolnou skupinu, které je členem
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	cs	Pokud je zapnutý režim safe_mode, eGW nemůže za běhu měnit některá nastavení ani načítat dosud nenačtené moduly
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	cs	Pokud je zapnutý režim safe_mode, EGw nemůže za běhu měnit některá nastavení ani načítat dosud nenačtené moduly
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	cs	Pokud aplikace nemá definovány tabulky, aktualizace by měla problém napravit
 if using ads (active directory)	setup	cs	Při použití ADS (Active Directory) autentikace
 if using cas (central authentication service):	setup	cs	Při použití CAS (Central Authentication Service):
@@ -379,7 +379,7 @@ ldap host	setup	cs	LDAP server
 ldap import	setup	cs	LDAP import
 ldap root password	setup	cs	LDAP root heslo
 ldap rootdn	setup	cs	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	cs	LDAP filtr pro vyhledávání účtů, výchozí: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	cs	LDAP filtr pro vyhledávání účtů, výchozí: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	cs	Ponechte prázdné pro zachování současného.
 leave empty to use default	setup	cs	Ponechte rázdné pro použití výchozího
 limit access	setup	cs	Omezit přístup
diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang
index 368757fd0b..6b4f8fe67e 100644
--- a/setup/lang/egw_de.lang
+++ b/setup/lang/egw_de.lang
@@ -30,7 +30,7 @@ accounts existing	setup	de	Benutzerkonten existieren
 actions	setup	de	Aktionen
 activate safe password check	setup	de	Aktiviere die "sichere Passwort" Überprüfung
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	de	Automatisch erzeugte Benutzer zu dieser Gruppe hinzufügen ("Default" wird versucht wenn nichts angegeben.)
-add new database instance (egw domain)	setup	de	Neue Datenbankinstanz (eGW Domain) hinzufügen
+add new database instance (egw domain)	setup	de	Neue Datenbankinstanz (EGw Domain) hinzufügen
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	de	Domain hinzufügen oder bearbeiten: [Domainname(default)],[DB-Name(egroupware)],[DB-Benutzer(egroupware)],DB-Passwort,[DB-Typ(mysql)],[DB-Host(localhost)],[DB-Port(DB spezifisch)],[Konfigurationsbenutzer(wie Header)],[Konfig-Passwort(wie Header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	de	Hinzufügen, bearbeiten oder Löschen einer EGroupware Domain / Datenbank Instanz
 additional options and there defaults (in brackets)	setup	de	Zusätzliche Optionen und ihre Vorgaben (in Klammer)
@@ -203,7 +203,7 @@ custom handler: %1	setup	de	Eigener Sitzunghandler: %1
 custom set via %1	setup	de	Benutzerdefiniert über "%1" gesetzt
 cyrus imap: admin user,password	setup	de	Cyrus IMAP: Adminbenutzer,Passwort
 database	setup	de	Datenbank
-database instance (egw domain)	setup	de	Datenbankinstanz (eGW Domain)
+database instance (egw domain)	setup	de	Datenbankinstanz (EGw Domain)
 database is version %1 and up to date.	setup	de	Datenbank ist Version %1 und aktuell.
 database successfully converted from '%1' to '%2'	setup	de	Datenbank erfolgreich von "%1" nach "%2" konvertiert
 datebase %1 droped.	setup	de	Datenbank %1 gelöscht.
@@ -335,7 +335,7 @@ however, the application is otherwise installed	setup	de	Wie auch immer, die Anw
 however, the application may still work	setup	de	Wie auch immer, die Anwendung mag dennoch funktionieren
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	de	HTTP Authetifizierungs Typen (Komma-getrennt) die ohne Login Seite benutzt werden sollen, zB. "NTLM"
 if no acl records for user or any group the user is a member of	setup	de	Wenn es keinen ACL-Eintrag für einen Benutzer oder eine Gruppe, der er angehört gibt
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	de	Wenn safe_mode eingeschaltet ist, kann eGW verschiedene Einstellungen nicht mehr zur Laufzeit ändern, noch können wir nicht geladene Erweiterungen (php extensions) laden.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	de	Wenn safe_mode eingeschaltet ist, kann EGw verschiedene Einstellungen nicht mehr zur Laufzeit ändern, noch können wir nicht geladene Erweiterungen (php extensions) laden.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	de	Wenn die Anwendung keine definierten Tabellen hat, wählen Sie überarbeiten. Das Problem sollte damit behoben werden.
 if using ads (active directory)	setup	de	Wenn Sie ADS (Active Directory) benutzen
 if using cas (central authentication service):	setup	de	Wenn Sie CAS (Central Authentication Service) benutzen
@@ -383,7 +383,7 @@ ldap host	setup	de	LDAP Host
 ldap import	setup	de	LDAP Import
 ldap root password	setup	de	LDAP Root Passwort
 ldap rootdn	setup	de	LDAP Root DN
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	de	LDAP Suchfilter für Benutzerkonten, Vorgabe "(uid=%user)", %domain=eGW Domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	de	LDAP Suchfilter für Benutzerkonten, Vorgabe "(uid=%user)", %domain=EGw Domain
 leave empty to keep current.	setup	de	Leer lassen um das existierende Password zu behalten.
 leave empty to use default	setup	de	leer lassen um Standard zu benutzen
 limit access	setup	de	Zugang beschränken
diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang
index 0521bfe388..d3c7d36b30 100644
--- a/setup/lang/egw_en.lang
+++ b/setup/lang/egw_en.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	en	%1 must be an integer value.
 (searching accounts and changing passwords)	setup	en	Searching accounts and changing passwords.
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	en	*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	en	*** You have to do the changes manually in your php.ini, usually in /etc on Linux in order to get eGW fully working !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	en	*** You have to do the changes manually in your php.ini, usually in /etc on Linux in order to get EGw fully working !!!
 00 (disable)	setup	en	00 (disable / recommended)
 13 (ntp)	setup	en	13 (ntp)
 80 (http)	setup	en	80 (http)
@@ -30,7 +30,7 @@ accounts existing	setup	en	Accounts existing
 actions	setup	en	Actions
 activate safe password check	setup	en	Activate safe password check
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	en	Add auto-created users to this group ('Default' will be attempted if this is empty.)
-add new database instance (egw domain)	setup	en	Add new database instance (eGW domain)
+add new database instance (egw domain)	setup	en	Add new database instance (EGw domain)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	en	add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	en	Adding, editing or deleting an EGroupware domain / database instance:
 additional options and there defaults (in brackets)	setup	en	Additional options and there defaults (in brackets)
@@ -203,7 +203,7 @@ custom handler: %1	setup	en	Custom handler: %1
 custom set via %1	setup	en	Custom set via %1
 cyrus imap: admin user,password	setup	en	Cyrus IMAP: admin user, password
 database	setup	en	Database
-database instance (egw domain)	setup	en	Database instance (eGW domain)
+database instance (egw domain)	setup	en	Database instance (EGw domain)
 database is version %1 and up to date.	setup	en	Database is version %1 and up to date.
 database successfully converted from '%1' to '%2'	setup	en	Database successfully converted from '%1' to '%2'
 datebase %1 droped.	setup	en	Database %1 dropped.
@@ -335,7 +335,7 @@ however, the application is otherwise installed	setup	en	The application is othe
 however, the application may still work	setup	en	The application may still work
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	en	HTTP auth types, comma-separated to use without login page, eg. "NTLM"
 if no acl records for user or any group the user is a member of	setup	en	If no ACL records for user or any group the user is a member of
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	en	If safe_mode is turned on, eGW is not able to change certain settings on runtime, nor can we load any not yet loaded module.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	en	If safe_mode is turned on, EGw is not able to change certain settings on runtime, nor can we load any not yet loaded module.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	en	If the application has no defined tables, selecting upgrade should remedy the problem
 if using ads (active directory)	setup	en	If using ADS (Active Directory) authentication
 if using cas (central authentication service):	setup	en	if using cas (Central Authentication Service):
@@ -383,7 +383,7 @@ ldap host	setup	en	LDAP host
 ldap import	setup	en	LDAP import
 ldap root password	setup	en	LDAP root password
 ldap rootdn	setup	en	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	en	LDAP search filter for accounts, default: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	en	LDAP search filter for accounts, default: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	en	Leave empty to keep current.
 leave empty to use default	setup	en	leave empty to use default
 limit access	setup	en	Limit access
diff --git a/setup/lang/egw_es-es.lang b/setup/lang/egw_es-es.lang
index fd6a81b71e..56f43abc06 100644
--- a/setup/lang/egw_es-es.lang
+++ b/setup/lang/egw_es-es.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	es-es	%1 debe ser un valor entero
 (searching accounts and changing passwords)	setup	es-es	(buscando cuentas y cambiando contraseñas)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	es-es	*** NO actualice su base de datos mediante esta instalación, ya que la actualización podría interrumpirse por el tiempo máximo de ejecución permitido, lo que deja su base de datos en un estado irrecuperable ¡¡(se pierden los datos)!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	es-es	*** Tiene que hacer los cambios manualmente en su php.ini (normalmente en /etc en linux) para que eGW funcione completamente ***
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	es-es	*** Tiene que hacer los cambios manualmente en su php.ini (normalmente en /etc en linux) para que EGw funcione completamente ***
 00 (disable)	setup	es-es	00 (desactivar / recomendado)
 13 (ntp)	setup	es-es	13 (ntp)
 80 (http)	setup	es-es	80 (http)
@@ -30,7 +30,7 @@ accounts existing	setup	es-es	Existen cuentas
 actions	setup	es-es	Acciones
 activate safe password check	setup	es-es	Activar la comprobación para guardar contraseñas
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	es-es	Añadir usuarios creados automáticamente a este grupo (si está vacío, se le asignará el grupo predeterminado)
-add new database instance (egw domain)	setup	es-es	Añadir nueva instancia de base de datos (dominio eGW)
+add new database instance (egw domain)	setup	es-es	Añadir nueva instancia de base de datos (dominio EGw)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	es-es	añadir o editar un dominio: [nombre dominio (default)], [nombre base de datos (egroupware)], [usuario de la base de datos (egroupware)], contraseña de la base de datos,[tipo de base de datos [mysql)], [servidor de la base de datos (localhost)],[puerto de la base de datos (específico de la base de datos)], [usuario de configuración (como encabezado)], [contraseña de configuración (como encabezado)]
 adding, editing or deleting an egroupware domain / database instance:	setup	es-es	Añadir, editar o borrar un dominio o instancia de EGroupware
 additional options and there defaults (in brackets)	setup	es-es	Opciones adicionales y predeterminadas (entre corchetes)
@@ -193,7 +193,7 @@ custom handler: %1	setup	es-es	Manejador personalizado: %1
 custom set via %1	setup	es-es	Conjunto personalizado via %1
 cyrus imap: admin user,password	setup	es-es	Cyrus IMAP: Usuario administrador, contraseña
 database	setup	es-es	Base de datos
-database instance (egw domain)	setup	es-es	Instancia de la base de datos (dominio eGW)
+database instance (egw domain)	setup	es-es	Instancia de la base de datos (dominio EGw)
 database is version %1 and up to date.	setup	es-es	La versión de la base de datos es %1 y está actualizada.
 database successfully converted from '%1' to '%2'	setup	es-es	La base de datos se convirtió correctamente de '%1' a '%2'
 datebase %1 droped.	setup	es-es	Se ha borrado la base de datos %1.
@@ -317,7 +317,7 @@ however, the application is otherwise installed	setup	es-es	De todas formas, la
 however, the application may still work	setup	es-es	Sin embargo, puede que la aplicación todavía funcione
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	es-es	Tipos de identificación HTTP (separados por comas) a usar sin página de inicio de sesión. Por ejemplo, "NTLM"
 if no acl records for user or any group the user is a member of	setup	es-es	Si no hay registros ACL ni grupo para el usuario, entonces es miembro de
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	es-es	Si está activado safe_mode, eGW no puede cambiar ciertas opciones en modo de ejecución, ni puede cargar ningún módulo que aún no sea cargable.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	es-es	Si está activado safe_mode, EGw no puede cambiar ciertas opciones en modo de ejecución, ni puede cargar ningún módulo que aún no sea cargable.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	es-es	Si la aplicación no ha definido tablas, seleccionando actualizar debería de remediar el problemas
 if using ads (active directory)	setup	es-es	Si se usa identificación del Directorio Activo
 if using cas (central authentication service):	setup	es-es	Si se usa CAS (Sistema de identificación centralizado):
@@ -363,7 +363,7 @@ ldap host	setup	es-es	Servidor LDAP
 ldap import	setup	es-es	Importar LDAP
 ldap root password	setup	es-es	Contraseña del administrador LDAP
 ldap rootdn	setup	es-es	rootdn LDAP
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	es-es	Filtro de búsqueda LDAP para las cuentas. Predeterminado: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	es-es	Filtro de búsqueda LDAP para las cuentas. Predeterminado: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	es-es	Dejar en blanco para mantener el actual
 limit access	setup	es-es	Limitar aceso
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	es-es	Limitar el acceso a la instalación a las siguientes direcciones, redes o máquinas (p. ej. 127.0.0.1,10.1.1,myhost.dyndns.org)
diff --git a/setup/lang/egw_fi.lang b/setup/lang/egw_fi.lang
index b511bf2f68..cbf6c18af9 100644
--- a/setup/lang/egw_fi.lang
+++ b/setup/lang/egw_fi.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	fi	%1 pitää olla kokonaisluku!
 (searching accounts and changing passwords)	setup	fi	Etsitään tunnuksia ja vaihdetaan salasanoja..
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	fi	*** Älä päivitä tietokantaa asennuksen kautta, koska päivitysaika saattaa ylittää max_execution_time-määrityksen, jolloin tietokanta jää toimimattomaan tilaan (data menetetään) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	fi	*** Muokkaa php.ini-tiedostoa käsin (tiedosto on Linuxissa yleensä hakemistossa /etc) voidaksesi käyttää eGW:n kaikkia ominaisuuksia !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	fi	*** Muokkaa php.ini-tiedostoa käsin (tiedosto on Linuxissa yleensä hakemistossa /etc) voidaksesi käyttää EGw:n kaikkia ominaisuuksia !!!
 00 (disable)	setup	fi	00 (ei käytössä / suositus)
 13 (ntp)	setup	fi	13 (ntp)
 80 (http)	setup	fi	80 (http)
@@ -177,7 +177,7 @@ current version	setup	fi	Nykyinen versio
 currently installed languages: %1 
	setup	fi	Asennetut kielet: %1 

 cyrus imap: admin user,password	setup	fi	Cyrus IMAP: pääkäyttäjä, salasana
 database	setup	fi	Tietokanta
-database instance (egw domain)	setup	fi	Tietokannan instanssi (eGW domain)
+database instance (egw domain)	setup	fi	Tietokannan instanssi (EGw domain)
 database is version %1 and up to date.	setup	fi	Tietokanta on versiosta %1 ja se päivitetään.
 database successfully converted from '%1' to '%2'	setup	fi	Tietokanta on konvertoitu versiosta '%1' versioon '%2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	fi	Datetime-portti.
Jos käytät porttia 13, määrittele palomuuriasetukset oikein ennen kuin lähetät tämän lomakkeen tiedot.
(Port: 13 / Host: 129.6.15.28)
@@ -279,7 +279,7 @@ however the tables are still in the database	setup	fi	Jokatapauksessa taulut ova
 however, the application is otherwise installed	setup	fi	Sovellus on muuten asennettu
 however, the application may still work	setup	fi	Sovellus voi toimia tästä huolimatta
 if no acl records for user or any group the user is a member of	setup	fi	Jos käyttäjällä tai käyttäjän ryhmillä ei ole ACL-tietueita, käyttäjä on tämän ryhmän jäsen:
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	fi	Jos safe_mode on päällä, eGW ei voi muuttaa kaikkia asetuksia ajon aikana, eikä ladata uusia moduuleita.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	fi	Jos safe_mode on päällä, EGw ei voi muuttaa kaikkia asetuksia ajon aikana, eikä ladata uusia moduuleita.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	fi	Jos sovelluksella ei ole määriteltyjä tauluja, päivittämisen pitäisi korjata ongelma
 if using ads (active directory)	setup	fi	Jos käytetään ADS (Active Directory) -tunnistusta
 if using cas (central authentication service):	setup	fi	Jos käytetään CAS (Central Authentication Service):
@@ -321,7 +321,7 @@ ldap host	setup	fi	LDAP-palvelin
 ldap import	setup	fi	LDAP-tuonti
 ldap root password	setup	fi	LDAP-pääkäyttäjän salasana
 ldap rootdn	setup	fi	LDAP-rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	fi	LDAP hakusuodin tunnuksille, oletus: "(uid=%user)", %domain=eGW-toimialue
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	fi	LDAP hakusuodin tunnuksille, oletus: "(uid=%user)", %domain=EGw-toimialue
 limit access	setup	fi	Rajoita pääsyä
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	fi	Rajoita asennukseen pääsy seuraaville verkkoalueille (esim. 127.0.0.1, 10.1.1, oma.toimialue.com)
 list availible values	setup	fi	Listaa saatavilla olevat arvot
diff --git a/setup/lang/egw_fr.lang b/setup/lang/egw_fr.lang
index 38931a1245..58d60b97ec 100644
--- a/setup/lang/egw_fr.lang
+++ b/setup/lang/egw_fr.lang
@@ -30,7 +30,7 @@ accounts existing	setup	fr	Comptes déjà créés
 actions	setup	fr	Actions
 activate safe password check	setup	fr	Activer la vérification de la sécurité des mots de passe
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	fr	Ajouter les utilisateurs auto-créés à ce groupe (le groupe 'Default' sera tenté si ceci est vide.)
-add new database instance (egw domain)	setup	fr	Ajouter une nouvelle instance de base de données (domaine eGW)
+add new database instance (egw domain)	setup	fr	Ajouter une nouvelle instance de base de données (domaine EGw)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	fr	ajouter ou modifier un domaine: [domain-name(par défaut)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(hôte local)],[db-port(spécifique base de données)],[config-user(comme En-tête)],[config-passwd(comme En-tête)]
 adding, editing or deleting an egroupware domain / database instance:	setup	fr	Ajouter, modifier ou supprimer un domaine / instance base de données EGroupware :
 additional options and there defaults (in brackets)	setup	fr	Options supplémentaires et leurs valeurs par défaut (entre parenthèses)
@@ -199,7 +199,7 @@ current version	setup	fr	Version actuelle
 currently installed languages: %1 
	setup	fr	Langues installées actuellement: %1 

 cyrus imap: admin user,password	setup	fr	Cyrus IMAP: Admin user,Password
 database	setup	fr	Base de données
-database instance (egw domain)	setup	fr	Instance de base de données (domaine eGW)
+database instance (egw domain)	setup	fr	Instance de base de données (domaine EGw)
 database is version %1 and up to date.	setup	fr	la base de données est en version %1 et est à jour
 database successfully converted from '%1' to '%2'	setup	fr	Base de données convertie de '%1' à '%2' avec succès
 datebase %1 droped.	setup	fr	Base de données %1 supprimée.
diff --git a/setup/lang/egw_hr.lang b/setup/lang/egw_hr.lang
index 1f7e60148d..07e8a7141a 100755
--- a/setup/lang/egw_hr.lang
+++ b/setup/lang/egw_hr.lang
@@ -1,7 +1,7 @@
 %1 does not exist !!!	setup	hr	%1 does not exist !!!
 %1 is %2%3 !!!	setup	hr	%1 is %2%3 !!!
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	hr	*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	hr	*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get eGW fully working !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	hr	*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get EGw fully working !!!
 00 (disable)	setup	hr	00 (disable / recomended)
 13 (ntp)	setup	hr	13 (ntp)
 80 (http)	setup	hr	80 (http)
@@ -170,7 +170,7 @@ hostname/ip of database server	setup	hr	Hostname/IP of database server
 however, the application is otherwise installed	setup	hr	However, the application is otherwise installed
 however, the application may still work	setup	hr	However, the application may still work
 if no acl records for user or any group the user is a member of	setup	hr	If no ACL records for user or any group the user is a member of
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	hr	If safe_mode is turned on, eGW is not able to change certain settings on runtime, nor can we load any not yet loaded module.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	hr	If safe_mode is turned on, EGw is not able to change certain settings on runtime, nor can we load any not yet loaded module.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	hr	If the application has no defined tables, selecting upgrade should remedy the problem
 if using ldap	setup	hr	If using LDAP
 if using ldap, do you want to manage homedirectory and loginshell attributes?	setup	hr	If using LDAP, do you want to manage homedirectory and loginshell attributes?
diff --git a/setup/lang/egw_it.lang b/setup/lang/egw_it.lang
index 4687e1d05c..afd074ec56 100644
--- a/setup/lang/egw_it.lang
+++ b/setup/lang/egw_it.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	it	%1 deve essere un valore intero
 (searching accounts and changing passwords)	setup	it	(ricerca di account e variazione password)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	it	*** NON aggiornare il tuo database tramite setup, perché l'aggiornamento potrebbe essere interrotto dal max_execution_time, che lascerebbe il tuo DB in uno stato irrecuperabile (dati persi) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	it	*** Devi effettuare manualmente le modifiche al tuo php.ini (di solito in /etc su linux) perché eGW sia completamente funzionante !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	it	*** Devi effettuare manualmente le modifiche al tuo php.ini (di solito in /etc su linux) perché EGw sia completamente funzionante !!!
 00 (disable)	setup	it	00 (disabilitato/ consigliato)
 13 (ntp)	setup	it	13 (ntp)
 80 (http)	setup	it	80 (http)
diff --git a/setup/lang/egw_iw.lang b/setup/lang/egw_iw.lang
index 1609de8ad9..6c15d43a0e 100755
--- a/setup/lang/egw_iw.lang
+++ b/setup/lang/egw_iw.lang
@@ -200,7 +200,7 @@ ldap groups context	setup	iw	LDAP הקשר קבוצות
 ldap host	setup	iw	LDAP מחשב
 ldap import	setup	iw	LDAP ייבוא
 ldap root password	setup	iw	LDAP של root סיסמת
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	iw	(uid=%user)", %domain=eGW-domain: ברירת מחדל, LDAP מסנן חיפוש עבור חשבונות
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	iw	(uid=%user)", %domain=EGw-domain: ברירת מחדל, LDAP מסנן חיפוש עבור חשבונות
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	iw	(127.0.0.1,10.1.1,myhost.dnydns.org :הגבל גישה להגדרה לרשתות, כתובות או מחשבים הבאים (למשל
 login to mysql -	setup	iw	mysql-כנס ל
 logout	setup	iw	יציאה מהמערכת
diff --git a/setup/lang/egw_lv.lang b/setup/lang/egw_lv.lang
index 6257d66a74..5091dd2d83 100644
--- a/setup/lang/egw_lv.lang
+++ b/setup/lang/egw_lv.lang
@@ -215,7 +215,7 @@ ldap host	setup	lv	LDAP hosts
 ldap import	setup	lv	LDAP importēt
 ldap root password	setup	lv	LDAP saknes parole
 ldap rootdn	setup	lv	LDAP saknesdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	lv	LDAP meklēšanas filtrs kontiem, noklusējums:"(uid=%lietotājs)",%domēns=eGW-domēns
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	lv	LDAP meklēšanas filtrs kontiem, noklusējums:"(uid=%lietotājs)",%domēns=EGw-domēns
 login to mysql -	setup	lv	Pieteikties msql -
 logout	setup	lv	Iziet
 mail domain (for virtual mail manager)	setup	lv	Pasta domēns (Virtuālajam pasta pārvaldniekam)
diff --git a/setup/lang/egw_nl.lang b/setup/lang/egw_nl.lang
index 9af3861ddc..5a935bdbbb 100644
--- a/setup/lang/egw_nl.lang
+++ b/setup/lang/egw_nl.lang
@@ -25,7 +25,7 @@ accounts existing	setup	nl	Bestaande accounts
 actions	setup	nl	Acties
 activate safe password check	setup	nl	Activeer de veilige wachtwoorden controle
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	nl	Automatisch gecreërde gebruikers toevoegen aan deze groep ('Standaard' wordt gebruikt als dit veld leeg is)
-add new database instance (egw domain)	setup	nl	Voeg een nieuwe database instantie toe (eGW domein)
+add new database instance (egw domain)	setup	nl	Voeg een nieuwe database instantie toe (EGw domein)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	nl	Voeg toe of bewerk domein: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	nl	Toevoegen, bewerken of verwijderen van een EGroupware domein / database instantie:
 additional options and there defaults (in brackets)	setup	nl	Additionele opties en hun standaardwaarden (tussen haken)
@@ -178,7 +178,7 @@ custom handler: %1	setup	nl	Custom handler: %1
 custom set via %1	setup	nl	Custom set via %1
 cyrus imap: admin user,password	setup	nl	Cyrus IMAP: Beheerder gebruiker, Wachtwoord
 database	setup	nl	Database
-database instance (egw domain)	setup	nl	Database instantie (eGW domein)
+database instance (egw domain)	setup	nl	Database instantie (EGw domein)
 database is version %1 and up to date.	setup	nl	database is versie %1 en actueel
 database successfully converted from '%1' to '%2'	setup	nl	Database is met succes geconverteerd van '%1' naar %'2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	nl	Datetime poort.
Indien poort 13 gebruikt wordt, stel a.u.b. de firewall regels hiervoor in voordat u deze pagina verzendt.
(Poort: 13 / Host: 129.6.15.28)
@@ -294,7 +294,7 @@ however, the application is otherwise installed	setup	nl	Hoewel, de toepassing i
 however, the application may still work	setup	nl	Hoewel, de toepassing zal misschien werken
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	nl	HTTP auth types (komma gescheiden) die gebruikt moeten worden zonder loginpagina, bijvoorbeeld "NTLM"
 if no acl records for user or any group the user is a member of	setup	nl	Als er ACL records voor de gebruiker of een willekeurige groep zijn is de gebruiker lid van
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	nl	Indien safe_mode ingeschakeld is kan eGW bepaalde instellingen niet tijdens runtime wijzen, bovendien kunnen we geen enkele nog niet geladen module laden.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	nl	Indien safe_mode ingeschakeld is kan EGw bepaalde instellingen niet tijdens runtime wijzen, bovendien kunnen we geen enkele nog niet geladen module laden.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	nl	Indien de toepassing geen tabellen heeft gedefinieerd is het kiezen voor upgrade de oplossing voor dit problemen
 if using ads (active directory)	setup	nl	Indien ADS (Active Directory) authenticatie gebruikt wordt
 if using cas (central authentication service):	setup	nl	indien cas gebruikt wordt (Centrale Authenticatie Service)
@@ -339,7 +339,7 @@ ldap host	setup	nl	LDAP host
 ldap import	setup	nl	LDAP importeren
 ldap root password	setup	nl	LDAP root wachtwoord
 ldap rootdn	setup	nl	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	nl	LDAP zoekfilter voor accounts, standaard: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	nl	LDAP zoekfilter voor accounts, standaard: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	nl	Laat leeg om huidige te behouden.
 limit access	setup	nl	Beperk toegang
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	nl	Limiteer toegang tot de setup tot de volgende adressen, netwerken of hostnamen (voorbeeld: 127.0.0.1,10.1.1,myhost.dnydns.org)
diff --git a/setup/lang/egw_no.lang b/setup/lang/egw_no.lang
index d334727d57..e977c85a1b 100644
--- a/setup/lang/egw_no.lang
+++ b/setup/lang/egw_no.lang
@@ -2,7 +2,7 @@
 %1 is %2%3 !!!	setup	no	%1 er %2%3 !!!
 (searching accounts and changing passwords)	setup	no	(søker opp konto og endrer passord)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	no	Oppdater *IKKE* databasen via setup. Oppdateringen kan avbrytas av max_execution_time hvilket ødelegger databasen ugjenkallelig!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	no	***Du må oppdatere php.ini manuellt (finnes vanligvis i /etc på Linux og i windows-mappen på Windows) for å få eGW til å fungere.
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	no	***Du må oppdatere php.ini manuellt (finnes vanligvis i /etc på Linux og i windows-mappen på Windows) for å få EGw til å fungere.
 00 (disable)	setup	no	00 (steng av/ anbefalt)
 13 (ntp)	setup	no	13 (ntp)
 80 (http)	setup	no	80 (http)
@@ -133,7 +133,7 @@ default	setup	no	Standard
 default file system space per user/group ?	setup	no	Standardutrymme i filsystemet per användare/grupp?
 delete	setup	no	Ta bort
 delete all existing sql accounts, groups, acls and preferences (normally not necessary)?	setup	no	Ta bort existerande SQL-konton, grupper, behörigheter och inställningar (normalt inte nödvändigt)?
-delete all my tables and data	setup	no	Ta bort alla eGW-tabeller och dess data
+delete all my tables and data	setup	no	Ta bort alla EGw-tabeller och dess data
 delete all old languages and install new ones	setup	no	Ta bort samtliga språk och installer nye
 deleting tables	setup	no	Sletter tabeller
 demo server setup	setup	no	Oppsett for demotjener
@@ -197,7 +197,7 @@ hour (0-24)	setup	no	Time (0-24)
 however, the application is otherwise installed	setup	no	Programmet er fortsatt installert
 however, the application may still work	setup	no	Det kan hende programmet fortsatt virker
 if no acl records for user or any group the user is a member of	setup	no	Om inga åtkomstregler finns för användaren eller de grupper användaren är medlem av
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	no	Om Safe Mode är aktiverat kan inte eGW ändra vissa inställningar medans den kör, eller ladda  en modul som inte redan är laddad.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	no	Om Safe Mode är aktiverat kan inte EGw ändra vissa inställningar medans den kör, eller ladda  en modul som inte redan är laddad.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	no	Om applikationen saknar definerade tabeller bör du välja att uppgradera den.
 if using ads (active directory)	setup	no	Dersom det benyttes ADS (Active Directory) autentisering.
 if using ldap	setup	no	Om LDAP används
@@ -233,7 +233,7 @@ ldap host	setup	no	LDAP tjener (server)
 ldap import	setup	no	LDAP import
 ldap root password	setup	no	LDAP root passord
 ldap rootdn	setup	no	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	no	LDAP sökfilter för konton, default: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	no	LDAP sökfilter för konton, default: "(uid=%user)", %domain=EGw-domain
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	no	Begränsa åtkomst till följande adresser, nätverk eller hostnamn (dvs 127.0.0.1,192.168.1,frodo.mydomain.org
 login to mysql -	setup	no	login till mysql -
 logout	setup	no	logg ut
diff --git a/setup/lang/egw_pl.lang b/setup/lang/egw_pl.lang
index e8b8ecc5e3..720664d7dc 100755
--- a/setup/lang/egw_pl.lang
+++ b/setup/lang/egw_pl.lang
@@ -16,14 +16,14 @@
 '%1' must be integer	setup	pl	%1 musi mieć wartość INTEGER
 (searching accounts and changing passwords)	setup	pl	(wyszukuję konta i zmieniam hasła)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	pl	*** Nie aktualizuj bazy danych przez aplikację ustawień. ponieważ aktualizacja może być przerwana przez parametr maksymalnego czasu wykonania, co spowoduje uszkodzenie bazy danych - dane zostaną utracone!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	pl	*** Należy wykonać zmiany w pliku php.ini ręcznie (zwykle w /etc/ dla OS Linux) by eGW w pełni działał.
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	pl	*** Należy wykonać zmiany w pliku php.ini ręcznie (zwykle w /etc/ dla OS Linux) by EGw w pełni działał.
 00 (disable)	setup	pl	00 (wyłączony / opcja zalecana)
 13 (ntp)	setup	pl	13 (ntp)
 80 (http)	setup	pl	80 (http)
 charset to use (use utf-8 if you plan to use languages with different charsets):	setup	pl	zestaw znaków do użycia (wybierz UTF8 jeżeli planujesz używać różnych języków z różnymi zestawami znaków)
 ==> different group '%1' under that gidnumber %2, not setting memberships!	setup	pl	===> inna grupa '%1' pod numerem gidNumber , nie ustawiono przynależności.
 [header-password],[header-user],[new-password],[new-user]	setup	pl	[hasło-administracyjne (header)],[użytkownik-administracyjny (header)],[nowe-hasło],[nowy-użytkownik]
-access denied: wrong username or password for manage-header !!!	setup	pl	Dostęp zabroniony: nieprawidłowa nazwa użytkownika lub hasło do zarządzania domenami eGW!
+access denied: wrong username or password for manage-header !!!	setup	pl	Dostęp zabroniony: nieprawidłowa nazwa użytkownika lub hasło do zarządzania domenami EGw!
 access denied: wrong username or password to configure the domain '%1(%2)' !!!	setup	pl	Dostęp zabroniony: nieprawidłowa nazwa użytkownika lub hasło do konfigurowania domeny '%1(%2)'!
 account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|true}],[allow cookie auth{ (default)|true}]	setup	pl	konto repozytorium{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|True}],[allow cookie auth{ (default)|True}]
 accounts existing	setup	pl	Konta istnieją
@@ -40,8 +40,8 @@ admin email address	setup	pl	Adres e-mail administratora
 admin first name	setup	pl	Imię administratora
 admin last name	setup	pl	Nazwisko administratora
 admin password	setup	pl	Hasło administratora
-admin password to header manager	setup	pl	Hasło konta do administracji domenami eGW
-admin user for header manager	setup	pl	Nazwa konta do administracji domenami eGW
+admin password to header manager	setup	pl	Hasło konta do administracji domenami EGw
+admin user for header manager	setup	pl	Nazwa konta do administracji domenami EGw
 admin username	setup	pl	Nazwa administratora
 admins	setup	pl	Administratorzy
 after backing up your tables first.	setup	pl	Po wcześniejszym wykonaniu kopii zapasowej tabel
@@ -143,7 +143,7 @@ checking pear%1 is installed	setup	pl	Sprawdzam czy PEAR%1 jest zainstalowany
 checking php.ini	setup	pl	Sprawdzam plik php.ini
 checking required php version %1 (recommended %2)	setup	pl	Sprawdzam wersje PHP (wymana %1, pożądana %2)
 checking the egroupware installation	setup	pl	Sprawdzam instalację EGroupware
-checks egroupware's installed, it's versions and necessary upgrads (return values see --exit-codes)	setup	pl	Sprawdzam instalacje eGW, jego wersję i ważne aktualizacje (zwraca wartość --kod-wyjścia)
+checks egroupware's installed, it's versions and necessary upgrads (return values see --exit-codes)	setup	pl	Sprawdzam instalacje EGw, jego wersję i ważne aktualizacje (zwraca wartość --kod-wyjścia)
 click here to return to setup.	setup	pl	wybierz here by wrócić do menu setup.
 click here	setup	pl	Kliknij tutaj
 click here to re-run the installation tests	setup	pl	Kliknij, aby ponowić testy instalacyjne
@@ -162,7 +162,7 @@ configure now	setup	pl	Konfiguruj teraz
 confirm to delete this backup?	setup	pl	Czy na pewno usunąć kopię zapasową?
 contain	setup	pl	zawiera
 continue	setup	pl	Kontunuj
-continue to the header admin	setup	pl	Przejdź do administrowania domenami eGW
+continue to the header admin	setup	pl	Przejdź do administrowania domenami EGw
 convert	setup	pl	Konwertuj
 convert backup to charset selected above	setup	pl	Wykonaj konwersję kopii zapasowej do zestawu znaków wskazanego powyżej
 could not open header.inc.php for writing!	setup	pl	Plik 'header.inc.php' nie może być zapisany przez serwer WWW.
@@ -292,7 +292,7 @@ go to	setup	pl	Idź do
 grant access	setup	pl	Przydziel dostęp
 group memberships will be migrated too.	setup	pl	Zawartość grupy będzie również zmigrowana .
 has a version mismatch	setup	pl	ma niezgodną wersję
-header admin login	setup	pl	Logowanie do administrowania domenami eGW
+header admin login	setup	pl	Logowanie do administrowania domenami EGw
 header password	setup	pl	Hasło do zarządzania domenami
 header username	setup	pl	Użytkownik do zarządzania domenami
 header-password[,header-user(admin)]	setup	pl	hasło-header[,użytkownik--header(admin)]
@@ -312,7 +312,7 @@ however, the application is otherwise installed	setup	pl	Mimo to aplikacja jest
 however, the application may still work	setup	pl	Mimo to aplikacja może ciągle pracować
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	pl	typy autoryzacji HTTP (oddzielone przecinkami) do używania bez strony logowania, np. "NTLM"
 if no acl records for user or any group the user is a member of	setup	pl	Jeśli brak uprawnień dostępu (ACL) dla użytkownika lub jakiejkolwiek grupy, której użytkownik jest członkiem
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	pl	Jeśli tryb bezpieczny (safe_mode) jest aktywny, eGW nie może zmieniać różnych ustawień poprzez runtime ani nie można załadować do tej pory niezaładowanych modułów.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	pl	Jeśli tryb bezpieczny (safe_mode) jest aktywny, EGw nie może zmieniać różnych ustawień poprzez runtime ani nie można załadować do tej pory niezaładowanych modułów.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	pl	Jeśli aplikacja nie ma zdefiniowanych tabel, wybór aktualizacji rozwiąże problem.
 if using ads (active directory)	setup	pl	Jeśli używana autoryzacja  ADS (Active Directory)
 if using cas (central authentication service):	setup	pl	Jeśli używany CAS (Central Authentication Service):
@@ -356,7 +356,7 @@ ldap host	setup	pl	Stacja (host) LDAP
 ldap import	setup	pl	LDAP IMPORT
 ldap root password	setup	pl	Hasło użytkownika root LDAP
 ldap rootdn	setup	pl	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pl	Filtr wyszukiwarki LDAP dla kont, domyślnie: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pl	Filtr wyszukiwarki LDAP dla kont, domyślnie: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	pl	Pozostaw puste by użyć bieżących ustawień
 limit access	setup	pl	Ogranicz dostęp
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	pl	Dostęp do menu setup ograniczony z tego adresu, sieci lub hosta (np. 127.0.0.1,10.1.1,myhost.dnydns.org)
@@ -373,14 +373,14 @@ make sure that your database is created and the account permissions are set	setu
 manage applications	setup	pl	Zarządzanie aplikacjami
 manage languages	setup	pl	Zarządzanie językami
 manual / help	setup	pl	Podręcznik pomocy
-max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures	setup	pl	max_execution_time jest ustawiony na mniej niż 30 (sekund): eGW wymaga czasami dłuższego czasu time_execution - mogą powstać błędy
+max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures	setup	pl	max_execution_time jest ustawiony na mniej niż 30 (sekund): EGw wymaga czasami dłuższego czasu time_execution - mogą powstać błędy
 maximum account id (e.g. 65535 or 1000000)	setup	pl	Maksymalny ID konta (np. 65535 lub 1000000)
 may be broken	setup	pl	być może uszkodzony
 mcrypt algorithm (default tripledes)	setup	pl	Mcrypt algorithm (default TRIPLEDES)
 mcrypt initialization vector	setup	pl	Wektor inicjalizujący MCrypt
 mcrypt mode (default cbc)	setup	pl	Mcrypt mode (default CBC)
 mcrypt settings (requires mcrypt php extension)	setup	pl	Ustawienia Mcrypt (wymaga rozszerzenia PHP: mcrypt)
-memory_limit is set to less than %1: some applications of egroupware need more than the recommend 8m, expect occasional failures	setup	pl	memory_limit jest ustawiony na mniej niż 5!: niektóre aplikacje eGW wymagają więcej niż zalecane 8M - mogą powstać błędy.
+memory_limit is set to less than %1: some applications of egroupware need more than the recommend 8m, expect occasional failures	setup	pl	memory_limit jest ustawiony na mniej niż 5!: niektóre aplikacje EGw wymagają więcej niż zalecane 8M - mogą powstać błędy.
 migration between egroupware account repositories	setup	pl	Migracja międzu repozytoriami kont EGroupware
 min backup count	setup	pl	Liczba kopi bezpieczeństwa do przechowywania (zero: wszystkie/ bez limitu)
 minimum account id (e.g. 500 or 100, etc.)	setup	pl	Minimalny ID konta (np. 500 lub 100, itd.)
@@ -391,7 +391,7 @@ modify	setup	pl	Modyfikuj
 month	setup	pl	Miesiąc
 multi-language support setup	setup	pl	Instalacja wersji językowych
 name of database	setup	pl	Nazwa bazy danych
-name of db user egroupware uses to connect	setup	pl	Nazwa bazy danych użytkowników eGW używane do połączeń
+name of db user egroupware uses to connect	setup	pl	Nazwa bazy danych użytkowników EGw używane do połączeń
 never	setup	pl	Nigdy
 new	setup	pl	Nowa
 next run	setup	pl	Termin następnego wykonania
@@ -399,14 +399,14 @@ no	setup	pl	Nie
 no %1 support found. disabling	setup	pl	Brak wsparcia %1. Dezaktywowano
 no accounts existing	setup	pl	Brak kont
 no algorithms available	setup	pl	brak dostępnych algorytmów
-no egroupware domains / database instances exist! use --edit-header --domain to add one (--usage gives more options).	setup	pl	Brak domen eGW/ instancji baz danych! Użyj --edit-header --domain by dodać (--usage pokaże więcej opcji).
+no egroupware domains / database instances exist! use --edit-header --domain to add one (--usage gives more options).	setup	pl	Brak domen EGw/ instancji baz danych! Użyj --edit-header --domain by dodać (--usage pokaże więcej opcji).
 no header admin password set! use --edit-header [,] to set one (--usage gives more options).	setup	pl	Brak ustawionego hasła administratora dla menu header! Użyj --edit-header [,]  by dodać (--usage pokaże więcej opcji).
 no modes available	setup	pl	brak dostępnych trybów
 no update necessary, domain %1(%2) is up to date.	setup	pl	Aktualizacja niewymagana, domena %1(%2) jest aktualna.
 no valid timezone set! ("%1" is not sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)	setup	pl	Brak aktywnej strefy czasowej! ("%1" nie jest wystarczający, użyj identyfikatora strefy czasowej jak "%2", zobacz %3 pełną listę dostępnych identyfikatorów %4).
 no xml support found. disabling	setup	pl	Brak wsparcia dla XML. Deaktywowane
 not	setup	pl	nie
-not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	pl	Nie wszystkie algorytmy MCrypt i tryby pracują z eGW. Jeśli pojawiają się problemy wyłącz opcję.
+not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	pl	Nie wszystkie algorytmy MCrypt i tryby pracują z EGw. Jeśli pojawiają się problemy wyłącz opcję.
 not complete	setup	pl	Nie gotowe
 not completed	setup	pl	Nie zakończone
 not ready for this stage yet	setup	pl	Jeszcze nie gotowe na tym etapie
@@ -517,7 +517,7 @@ setting the system-charset to utf-8 (unicode) allows the coexistens of data from
 settings	setup	pl	Ustawienia
 setup	setup	pl	Setup
 setup the database	setup	pl	Setup bazy danych
-setup/config admin login	setup	pl	Logowanie do konfiguracji domeny eGW
+setup/config admin login	setup	pl	Logowanie do konfiguracji domeny EGw
 show 'powered by' logo on	setup	pl	Wyświetlaj logo 'działa w oparciu o'
 sieve: host[,port(4190)]	setup	pl	Nawiąż połączenie do: Host[,Port(4190)]
 size	setup	pl	Wielkość
@@ -528,7 +528,7 @@ some or all of its tables are missing	setup	pl	Some or all of its tables are mis
 sources deleted/missing	setup	pl	Śródło usunięte/zagubione
 sql encryption type	setup	pl	Typ kodowania haseł w SQL (domyślnie md5)
 ssl validation:	setup	pl	Walidacja SSL:
-standard (login-name identical to egroupware user-name)	setup	pl	standardowy (login identyczny do  użytkownika w eGW)
+standard (login-name identical to egroupware user-name)	setup	pl	standardowy (login identyczny do  użytkownika w EGw)
 standard mailserver settings (used for mail authentication too)	setup	pl	Ustawienia podstawowe serwera mail (używane również do autoryzacji maili)
 standard, as defined above	setup	pl	Standardowo jak zdefiniowano powyżej
 start the postmaster	setup	pl	Uruchom postmastera
@@ -565,7 +565,7 @@ the following applications are required, but not installed:	setup	pl	Następują
 the following applications need to be upgraded:	setup	pl	Następujące aplikacje powinny być aktualizowane:
 the function %1 is needed from: %2.	setup	pl	Funkcja %1 jest wymagana z: %2.
 the imagecreatefromjpeg function is supplied by the gd extension (complied with jpeg support!). it's needed to upload photos for contacts.	setup	pl	Funkcja imagecreatefromjpep jest dostarczana przez rozszerzenie GD (zgodnie ze wsparciem jpeg). Wymagane dla załączania fotografii do kontaktów.
-the json extension is required by egroupware for ajax.	setup	pl	Rozszerzenie JSON jest wymagane przez eGW dla AJAX.
+the json extension is required by egroupware for ajax.	setup	pl	Rozszerzenie JSON jest wymagane przez EGw dla AJAX.
 the ldap extension is needed, if you use ldap as account or contact storage, authenticate against ldap or active directory. it's not needed for a standard sql installation.	setup	pl	Rozszerzenie ldap jest wymagane jeśli LDAP używane do przechowywania kont i kontaktów lub autoryzacja z ldap do Active Directory. Nie wymagane do standardowej instalacji z bazą SQL.
 the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	pl	Rozszerzenie mbstring jest wymagane do pełnego wsparcia dla systemu kodowania (utf-8) lub wielobajtowego kodowania systemu znaków.
 the mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	pl	mbstring.func_overload = 7 jest wymagane do pełnego wsparcia dla systemu kodowania znaków (utf-8) lub wielobajtowego kodowania systemu znaków.
@@ -585,7 +585,7 @@ this program will convert your database to a new system-charset.	setup	pl	Progra
 this program will help you upgrade or install different languages for egroupware	setup	pl	Ten program pomoże Ci zainstalować lub uaktualnić wersje językowe EGroupware
 this should be around 30 bytes in length.
note: the default has been randomly generated.	setup	pl	Wymagana długość ok 30bajtów długości. 
Uwaga: przykład został wygenerowany losowo.
 this stage is completed
	setup	pl	Etap zakończony

-this will create a first user in egroupware or reset password and admin rights of an exiting user	setup	pl	Zostanie utworzony pierwszy użytkownik eGW lub hasło nadpisane ustawienia obecnego użytkownika admin.
+this will create a first user in egroupware or reset password and admin rights of an exiting user	setup	pl	Zostanie utworzony pierwszy użytkownik EGw lub hasło nadpisane ustawienia obecnego użytkownika admin.
 to a version it does not know about	setup	pl	do wersji o której nie ma informacji
 to allow password authentification add the following line to your pg_hba.conf (above all others) and restart postgres:	setup	pl	dodaj następującą linie do pg_hba.conf by zapewnić autoryzację haseł (dla wszystkich powyższych). Zrestartuj postgres:
 to change the charset: back up your database, deinstall all applications and re-install the backup with "convert backup to charset selected" checked.	setup	pl	By zmienić system kodowania znaków: wykonaj kopię bezpieczeństwa bazy danych, odinstaluj wszystkie aplikacje z opcją sprawdzania "konwertuj system kodowania znaków do wybranego".
@@ -611,8 +611,8 @@ uploads a backup and installs it on your db	setup	pl	załaduj kopię bezpieczeń
 uploads a backup to the backup-dir, from where you can restore it	setup	pl	załaduj kopię bezpieczeństwa do katalogu kopii bezpieczeństwa skąd może być odtwarzana
 usage: %1 command [additional options]	setup	pl	Użycie: polecenie %1 [dodatkowe opcje]
 use --create-header to create the configuration file (--usage gives more options).	setup	pl	Użyj --create-header do utworzenia pliku konfiguracyjnego (--usage pokaże więcej opcji).
-use --install to install egroupware.	setup	pl	Użyj --install by zainstalować eGW
-use --update to do so.	setup	pl	Użyj --update by zaktualizować eGW
+use --install to install egroupware.	setup	pl	Użyj --install by zainstalować EGw
+use --update to do so.	setup	pl	Użyj --update by zaktualizować EGw
 use cookies to pass sessionid	setup	pl	Używać cookie do przechowywania sessionid
 use mcrypt to crypt session-data: {off(default) | on},[mcrypt-init-vector(default randomly generated)],[mcrypt-version]	setup	pl	Użyj mcrypt do kodowania danych sesji: {off(default) | on},[mcrypt-init-vector(default randomly generated)],[mcrypt-version]
 use persistent db connections: {on(default) | off}	setup	pl	użyj stałego połączenia do bazy danych: {on(default) | off}
@@ -634,7 +634,7 @@ we could not determine the version of %1, please make sure it is at least %2	set
 we will automatically update your tables/records to %1	setup	pl	We will automatically update your tables/records to %1
 we will now run a series of tests, which may take a few minutes.  click the link below to proceed.	setup	pl	Zostaną przeprowadzone testy -- to może zająć kilka minut -- Wybierz poniższy link by zatwierdzić.
 welcome to the egroupware installation	setup	pl	Witamy w instalacji systemu EGroupware
-where should egroupware store file content	setup	pl	Gdzie eGW powinien przechowywać zawartość plików
+where should egroupware store file content	setup	pl	Gdzie EGw powinien przechowywać zawartość plików
 which database type do you want to use with egroupware?	setup	pl	Którą bazę danych chcesz używać z EGroupware
 world readable	setup	pl	do odczytu
 world writable	setup	pl	do zapisu
@@ -657,8 +657,8 @@ you can install it by running:	setup	pl	Można zainstalować to wydając polecen
 you can use the header user and password for every domain too. if the password is not set via the commandline, it is read from the enviroment variable egw_cli_password or queried from the user.	setup	pl	Możesz teraz używać użytkownika i hasła z HEADER do wszystkich domen. Jeśli to hasło nie jest ustawione przez linię poleceń, to jest pobierane ze zmiennych systemowych EGW_CLI_PASSWORD lub oczekuje podania przez użytkownika.
 you didn't enter a config password for domain %1	setup	pl	Nie podano hasła administratora dla domeny '%1'.
 you didn't enter a config username for domain %1	setup	pl	Nie podano nazwy administratora dla domeny '%1'.
-you didn't enter a header admin password	setup	pl	Nie podano hasła do administracji domenami eGW
-you didn't enter a header admin username	setup	pl	Nie podano nazwy użytkownika do administracji domenami eGW
+you didn't enter a header admin password	setup	pl	Nie podano hasła do administracji domenami EGw
+you didn't enter a header admin username	setup	pl	Nie podano nazwy użytkownika do administracji domenami EGw
 you do not have any languages installed. please install one now 
	setup	pl	You do not have any languages installed. Please install one now 

 you dont have jpgraph version %1 or higher installed! it is needed from projectmanager for ganttcharts.	setup	pl	JPGraph wersja %1 lub wyższa nie zainstalowana! Wymagane do działania Menadźera projektów - wykresów Ganta
 you have not created your header.inc.php yet!
 you can create it now.	setup	pl	Nie utworzono dotąd pliku konfiguracyjnego 'header.inc.php'!
Możesz zrobić to teraz.
@@ -681,7 +681,7 @@ your database is not working!	setup	pl	Baza danych nie pracuje!
 your database is working, but you dont have any applications installed	setup	pl	Twoja baza pracuje, ale nie ma zainstalowanej żadnej aplikacji
 your egroupware api is current	setup	pl	EGroupware API jest w najnowszej wersji
 your files directory '%1' %2	setup	pl	Katalog plików '%1' %2
-your header admin password is not set. please set it now!	setup	pl	Brak hasła administratora domen eGW. Proszę ustawić hasło teraz!
+your header admin password is not set. please set it now!	setup	pl	Brak hasła administratora domen EGw. Proszę ustawić hasło teraz!
 your header.inc.php needs upgrading.	setup	pl	Plik 'header.inc.php' wymaga aktualizacji
 your header.inc.php needs upgrading.
warning!
make backups!	setup	pl	Plik 'header.inc.php' wymaga aktualizacji.
UWAGA!
WYKONAJ KOPIĘ ZAPASOWĄ!
 your installed version of %1 is %2, required is at least %3, please run:	setup	pl	Zainstalowaną wersją komponentu '%1' jest '%2', podczas gdy wymagana jest przynajmniej %3, proszę wykonaj:
diff --git a/setup/lang/egw_pt-br.lang b/setup/lang/egw_pt-br.lang
index da234148ad..dff3f3e4fe 100644
--- a/setup/lang/egw_pt-br.lang
+++ b/setup/lang/egw_pt-br.lang
@@ -25,7 +25,7 @@ accounts existing	setup	pt-br	Contas existentes
 actions	setup	pt-br	Ações
 activate safe password check	setup	pt-br	Ativar salvamento de senhas
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	pt-br	Adicionar usuários criados automaticamente para este grupo (o grupo 'Padrão' será utilizado se este campo estiver vazio.)
-add new database instance (egw domain)	setup	pt-br	Adicionar nova base de dados (domínio eGW )
+add new database instance (egw domain)	setup	pt-br	Adicionar nova base de dados (domínio EGw )
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	pt-br	adicionar ou editar um domínio:
 adding, editing or deleting an egroupware domain / database instance:	setup	pt-br	Adicionando, editando ou removendo um domínio / base de dados do EGroupware:
 additional options and there defaults (in brackets)	setup	pt-br	Opções adicionais e valores padrões (entre parênteses)
@@ -171,7 +171,7 @@ currently installed languages: %1 
	setup	pt-br	Idiomas instalados atualmen
 custom set via %1	setup	pt-br	Definição personalizada através de %1
 cyrus imap: admin user,password	setup	pt-br	IMAP Cyrus: usuário administrador,senha
 database	setup	pt-br	Base de dados
-database instance (egw domain)	setup	pt-br	Instância da base de dados (domínio eGW)
+database instance (egw domain)	setup	pt-br	Instância da base de dados (domínio EGw)
 database is version %1 and up to date.	setup	pt-br	base de dados está na versão %1 e atualizada
 database successfully converted from '%1' to '%2'	setup	pt-br	Conversão bem sucedida da base de dados de '%1' para '%2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	pt-br	Nota ntp 
 se estiver usando a porta 13, por favor configure as regras de acesso do seu firewall corretamente antes de enviar essa página 
 (port 13 / servidor 129.6.15.28)
@@ -330,7 +330,7 @@ ldap host	setup	pt-br	Servidor LDAP
 ldap import	setup	pt-br	Importação LDAP
 ldap root password	setup	pt-br	Senha do super usuário LDAP
 ldap rootdn	setup	pt-br	Super usuário LDAP
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pt-br	Filtro de pesquisa para contas LDAP. Padrão: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pt-br	Filtro de pesquisa para contas LDAP. Padrão: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	pt-br	Deixe em branco para manter a atual
 limit access	setup	pt-br	Limitar acesso
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	pt-br	Limitar acesso ao setup aos seguintes endereços IP, redes ou nomes de domínio (ex: 127.0.0.1, 10.1.1, meudominio.nomesite.com.br)
diff --git a/setup/lang/egw_pt.lang b/setup/lang/egw_pt.lang
index abe0a8fbd8..53c68f4372 100644
--- a/setup/lang/egw_pt.lang
+++ b/setup/lang/egw_pt.lang
@@ -247,7 +247,7 @@ ldap host	setup	pt	Servidor LDAP
 ldap import	setup	pt	Importar LDAP
 ldap root password	setup	pt	Senha da raiz LDAP
 ldap rootdn	setup	pt	DN da raiz LDAP
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pt	Filtro de pesquisa LDAP para as contas, por omissão: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	pt	Filtro de pesquisa LDAP para as contas, por omissão: "(uid=%user)", %domain=EGw-domain
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	pt	Limitar o acesso à configuração aos endereços, redes ou servidores seguintes (ex: 127.0.0.1,10.1.1,meuservidor.dnydns.org)
 login as user postgres, eg. by using su as root	setup	pt	Aceder como utilizador postgres, ex: utilizando su como root
 login to mysql -	setup	pt	Aceder ao mysql -
diff --git a/setup/lang/egw_ru.lang b/setup/lang/egw_ru.lang
index ffcf6575a6..dfab491160 100644
--- a/setup/lang/egw_ru.lang
+++ b/setup/lang/egw_ru.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	ru	%1 должно быть целым числом.
 (searching accounts and changing passwords)	setup	ru	Поиск учетных записей и смена паролей
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	ru	*** НЕ обновляйте базу данных с помощью модуля установки, так-как обновление может быть прервано в связи с исчерпанием максимального времени запуска, что приведет вышу БД в невосстаноимое состояние (все данные будут утеряны) !!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	ru	*** Сделайте изменения вручную в вашем php.ini (в линуксе обычно находится в /etc), чтобы привести eGW в полную работоспособность !!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	ru	*** Сделайте изменения вручную в вашем php.ini (в линуксе обычно находится в /etc), чтобы привести EGw в полную работоспособность !!!
 00 (disable)	setup	ru	00 (отключить  / рекомендовано)
 13 (ntp)	setup	ru	13 (ntp)
 80 (http)	setup	ru	80 (http)
@@ -198,7 +198,7 @@ custom handler: %1	setup	ru	Пользовательский обработчи
 custom set via %1	setup	ru	Пользовательский набор через %1
 cyrus imap: admin user,password	setup	ru	Cyrus IMAP: имя входа администратора, пароль
 database	setup	ru	База данных
-database instance (egw domain)	setup	ru	Экземпляр базы данных (домен eGW)
+database instance (egw domain)	setup	ru	Экземпляр базы данных (домен EGw)
 database is version %1 and up to date.	setup	ru	Версия базы данных %1 актуальна
 database successfully converted from '%1' to '%2'	setup	ru	База данных успешно  преобразована из %1 в %2
 datebase %1 droped.	setup	ru	База данных %1 удалена
@@ -325,7 +325,7 @@ however, the application is otherwise installed	setup	ru	Однако, прил
 however, the application may still work	setup	ru	однако, приложение может все-еще работать
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	ru	Типы авторизации HTTP (разделенные запятыми) для использования без страницы логина, напр. "NTLM"
 if no acl records for user or any group the user is a member of	setup	ru	Если нет записей ACL для пользователя или группы, пользователь входит в
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	ru	Если безопасный режим включен, у eGW нет возможностии менять некоторые настройки при запуске так же как и нет возможности запускать любые еще не загруженные модули.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	ru	Если безопасный режим включен, у EGw нет возможностии менять некоторые настройки при запуске так же как и нет возможности запускать любые еще не загруженные модули.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	ru	Если приложение не имеет заранее определенных таблиц, выбор модернизации скорее всего вызовет ряд проблем
 if using ads (active directory)	setup	ru	Используя ADS (Active Directory) идентификацию
 if using cas (central authentication service):	setup	ru	При использовании CAS (Central Authentication Service)
@@ -371,7 +371,7 @@ ldap host	setup	ru	Имя сервера LDAP
 ldap import	setup	ru	Импорт  LDAP
 ldap root password	setup	ru	Пароль LDAP
 ldap rootdn	setup	ru	Корневой dn LDAP
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	ru	Фильтр поиска учетных записей LDAP, по умолчанию: "(uid=%user)",%domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	ru	Фильтр поиска учетных записей LDAP, по умолчанию: "(uid=%user)",%domain=EGw-domain
 leave empty to keep current.	setup	ru	Оставьте пустым для сохранения текущего значения.
 limit access	setup	ru	Ограничить доступ
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	ru	Ограничить доступ к установке следующими адресами, сетями или именами компьютеров (напр. 127.0.0.1,10.1.1,myhost.dnydns.org)
diff --git a/setup/lang/egw_sk.lang b/setup/lang/egw_sk.lang
index f1c30d08af..e321c6f5a9 100644
--- a/setup/lang/egw_sk.lang
+++ b/setup/lang/egw_sk.lang
@@ -16,7 +16,7 @@
 '%1' must be integer	setup	sk	%1 musí byť celočíselná hodnota.
 (searching accounts and changing passwords)	setup	sk	(prehľadávanie účtov a zmena hesiel)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	sk	NIKDY neaktualizujte vašu databázu pomocou Inštalátora, pretože aktualizácia by mohla byť prerušená na základe maximálneho času vykonávania, čo by zanechalo vašu databázu v dezolátnom stave (stratené všetky dáta)!!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sk	Zmeny musíte vykonať vo svojom php.ini (pod Linuxom zvyčajne v adresári /etc), až potom bude eGW plne funkčný!!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sk	Zmeny musíte vykonať vo svojom php.ini (pod Linuxom zvyčajne v adresári /etc), až potom bude EGw plne funkčný!!!
 00 (disable)	setup	sk	00 (zablokovať / odporúča sa)
 13 (ntp)	setup	sk	13 (ntp)
 80 (http)	setup	sk	80 (http)
@@ -28,7 +28,7 @@ accounts existing	setup	sk	Existujúce účty
 actions	setup	sk	Akcie
 activate safe password check	setup	sk	Aktivovať voľbu ukladania hesla
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	sk	Automaticky vytvorených používateľov priradiť do tejto skupiny (ak prázdne, použije sa 'Predvolená').
-add new database instance (egw domain)	setup	sk	Pridať novú databázovú inštanciu (eGW domain)
+add new database instance (egw domain)	setup	sk	Pridať novú databázovú inštanciu (EGw domain)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	sk	pridať alebo upraviť doménu: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	sk	Pridanie, úprava alebo odstránenie domény EGroupware / databázovej inštancie:
 additional options and there defaults (in brackets)	setup	sk	Prídavné možnosti a tam predvolené (v hranatých zátvorkách)
@@ -197,7 +197,7 @@ custom handler: %1	setup	sk	Vlastná obsluha: %1
 custom set via %1	setup	sk	Vlastné nastavenie cez %1
 cyrus imap: admin user,password	setup	sk	Cyrus IMAP: Správcovo používateľské meno,heslo
 database	setup	sk	Databáza
-database instance (egw domain)	setup	sk	Databázová inštancia (eGW domain)
+database instance (egw domain)	setup	sk	Databázová inštancia (EGw domain)
 database is version %1 and up to date.	setup	sk	Databáza má verziu %1 a je aktuálna.
 database successfully converted from '%1' to '%2'	setup	sk	Databáza bola úspešne konvertovaná z '%1' na '%2'
 datebase %1 droped.	setup	sk	Databáza %1 zahodená
@@ -318,7 +318,7 @@ however, the application is otherwise installed	setup	sk	Avšak aplikácia je in
 however, the application may still work	setup	sk	Avšak aplikácia možno stále funguje
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	sk	Typy HTTP autentifikácie (oddelené čiarkou) pre použitie na prihlasovacej stránke, napr. "NTML"
 if no acl records for user or any group the user is a member of	setup	sk	Ak pre používateľa neexistujú ACL záznamy, používateľom je členom
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sk	Ak je bezpečný režim zapnutý, eGW nedokáže zmeniť niektoré veci za behu, ani nahrať nejaký nenahratý modul.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sk	Ak je bezpečný režim zapnutý, EGw nedokáže zmeniť niektoré veci za behu, ani nahrať nejaký nenahratý modul.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	sk	Ak aplikácia nemá tabuľky definícií, voľba "aktualizácia" by mala problém vyriešiť
 if using ads (active directory)	setup	sk	Ak používate ADS (ActiveDirectory) autentifikáciu
 if using cas (central authentication service):	setup	sk	Ak používate cas (Centrálnu Autentifikačnú Službu):
@@ -366,7 +366,7 @@ ldap host	setup	sk	LDAP hostiteľ
 ldap import	setup	sk	LDAP Import
 ldap root password	setup	sk	LDAP root heslo
 ldap rootdn	setup	sk	LDAP koreňový dn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sk	LDAP vyhľadávací filter pre účty, predvolený: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sk	LDAP vyhľadávací filter pre účty, predvolený: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	sk	Ponechajte prázdne ak chcete zachovať súčasný stav.
 leave empty to use default	setup	sk	Ponechajte prázdne ak chcete použiť predvolenú hodnotu
 limit access	setup	sk	Obmedziť prístup
diff --git a/setup/lang/egw_sl.lang b/setup/lang/egw_sl.lang
index 3dd13ef7b1..32fa52839c 100644
--- a/setup/lang/egw_sl.lang
+++ b/setup/lang/egw_sl.lang
@@ -12,7 +12,7 @@
 '%1' is not allowed as %2. arguments of option %3 !!!	setup	sl	'%1' ni dovoljen kot %2. argument možnosti %3!
 (searching accounts and changing passwords)	setup	sl	(iskanje računov in spreminjanje gesel)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	sl	*** NE POSODABLJAJTE podatkovne baze preko namestitve. Lahko se zgodi, da bo posodabljanje prekinjeno zaradi predolgega izvajanja, kar posledično lahko pomeni izgubo podatkov!!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sl	*** Da bo eGW deloval pravilno morate spremembe ročno popraviti v datoteki php.ini (ponavadi v /etc na linuxu)!!!
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sl	*** Da bo EGw deloval pravilno morate spremembe ročno popraviti v datoteki php.ini (ponavadi v /etc na linuxu)!!!
 00 (disable)	setup	sl	00 (onemogoči / priporočeno)
 13 (ntp)	setup	sl	13 (ntp)
 80 (http)	setup	sl	80 (http)
@@ -25,7 +25,7 @@ accounts existing	setup	sl	Račun obstaja
 actions	setup	sl	Akcije
 activate safe password check	setup	sl	Aktivira varno preverjanje gesel
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	sl	Samodejno kreirani uporabniki se dodajo v to skupino (Če pustite prazno, bo uporabljena skupina 'Privzeto')
-add new database instance (egw domain)	setup	sl	Dodaj novo zbirko podatkov (domeno eGW)
+add new database instance (egw domain)	setup	sl	Dodaj novo zbirko podatkov (domeno EGw)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	sl	Doda ali uredi domeno:
 adding, editing or deleting an egroupware domain / database instance:	setup	sl	Dodajanje, urejanje ali brisanje domene EGroupware / zbirke podatkov:
 additional options and there defaults (in brackets)	setup	sl	Nadaljnje možnosti in privzete vrednosti (v oklepajih)
@@ -177,7 +177,7 @@ custom handler: %1	setup	sl	Ročnik po meri: %1
 custom set via %1	setup	sl	Nastavitev po meri %1
 cyrus imap: admin user,password	setup	sl	Cyrus IMAP: administratorko ime,geslo
 database	setup	sl	Zbirka podatkov
-database instance (egw domain)	setup	sl	Instanca zbirke podatkov (domena eGW)
+database instance (egw domain)	setup	sl	Instanca zbirke podatkov (domena EGw)
 database is version %1 and up to date.	setup	sl	Zbirka podatkov je različica %1 in je posodobljena.
 database successfully converted from '%1' to '%2'	setup	sl	Podatkovna baza je bila uspešno prevedena iz '%1' v '%2'.
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	sl	Vrata za datum.
Če uporabljate vrata 13, prosim, da ustrezno prilagodite pravila požarnega zidu, preden potrdite podatke na tej strani. 
(Vrata: 13 / Strežnik: 129.6.15.28)
@@ -293,7 +293,7 @@ however, the application is otherwise installed	setup	sl	Vendar je aplikacija na
 however, the application may still work	setup	sl	Vendar aplikacija še vedno deluje
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	sl	Vrste avtentikacije HTTP (ločene z vejico), za prijavo brez prijavne strani, kot na primer "NTLM"
 if no acl records for user or any group the user is a member of	setup	sl	Če ni ACL zapisov za uporabnika ali katerokoli skupino, katere član je
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sl	Če je vključen način "safe_mode", eGW med delovanjem ne more spremeniti nekaterih nastavitev  niti ne more naložiti novih modulov.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sl	Če je vključen način "safe_mode", EGw med delovanjem ne more spremeniti nekaterih nastavitev  niti ne more naložiti novih modulov.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	sl	Če aplikacija nima definiranih tabel, potem bi nadgrajevanje moralo rešiti težave.
 if using ads (active directory)	setup	sl	Če uporabljate ADS (Aktivni Direktorij ) overovljenje
 if using cas (central authentication service):	setup	sl	Če uporabljate cas (Central Authentication Service):
@@ -338,7 +338,7 @@ ldap host	setup	sl	LDAP strežnik
 ldap import	setup	sl	LDAP uvoz
 ldap root password	setup	sl	LDAP root geslo
 ldap rootdn	setup	sl	LDAP rootdn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sl	Iskalni filter LDAP računov, privzet: ("uid=%user"), %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sl	Iskalni filter LDAP računov, privzet: ("uid=%user"), %domain=EGw-domain
 leave empty to keep current.	setup	sl	Pustite prazno, da ohranite obstoječe.
 limit access	setup	sl	Omeji dostop
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	sl	Omejitev dostopa do nastavitev z naslovov, omrežij ali gostiteljev (npr. 127.0.0.1,10.1.1,myhost.dnydns.org)
@@ -355,14 +355,14 @@ make sure that your database is created and the account permissions are set	setu
 manage applications	setup	sl	Upravljanje aplikacij
 manage languages	setup	sl	Upravljanje jezikov
 manual / help	setup	sl	Priročnik/pomoč
-max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures	setup	sl	Najdaljši čas izvajanja (max_execution_time) je nastavljen na manj kot 30 sekund: eGW občasno potrebuje daljši čas izvajanja zato lahko pričajujete občasne napake
+max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures	setup	sl	Najdaljši čas izvajanja (max_execution_time) je nastavljen na manj kot 30 sekund: EGw občasno potrebuje daljši čas izvajanja zato lahko pričajujete občasne napake
 maximum account id (e.g. 65535 or 1000000)	setup	sl	Najvišji ID uporabniškega računa (npr. 65535 ali 1000000)
 may be broken	setup	sl	morda je prekinjen
 mcrypt algorithm (default tripledes)	setup	sl	Mcrypt algoritem (privzeto TIRPLEDES)
 mcrypt initialization vector	setup	sl	Mcrypt začetni vektor
 mcrypt mode (default cbc)	setup	sl	Mcrypt način (privzeto CBC)
 mcrypt settings (requires mcrypt php extension)	setup	sl	Mcrypt nastavitve (zahteva mcrypt razširitev PHPja)
-memory_limit is set to less than %1: some applications of egroupware need more than the recommend 8m, expect occasional failures	setup	sl	Omejitev spomina (memory_limit) je nastavljena na manj kot 16 Mb: nekatere aplikacije v eGW potrebujejo več kot priporočljivih 8 Mb zato se lahko pojavijo občasne napake
+memory_limit is set to less than %1: some applications of egroupware need more than the recommend 8m, expect occasional failures	setup	sl	Omejitev spomina (memory_limit) je nastavljena na manj kot 16 Mb: nekatere aplikacije v EGw potrebujejo več kot priporočljivih 8 Mb zato se lahko pojavijo občasne napake
 migration between egroupware account repositories	setup	sl	Migracija med repozitoriji uporabniških računov EGroupware
 minimum account id (e.g. 500 or 100, etc.)	setup	sl	Najnižji ID računa (npr. 500 ali 100)
 minute	setup	sl	minuta
@@ -387,7 +387,7 @@ no modes available	setup	sl	Ni razpoložljivih načinov
 no update necessary, domain %1(%2) is up to date.	setup	sl	Posodobitev ni potrebna, domena %1 (%2) je posodobljena.
 no xml support found. disabling	setup	sl	Ni podpore za XML. Onemogočam.
 not	setup	sl	ne
-not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	sl	Vsi mcrypt algoritmi in načini ne delujejo v eGW. Če se pojavijo težave, jih izklopite.
+not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	sl	Vsi mcrypt algoritmi in načini ne delujejo v EGw. Če se pojavijo težave, jih izklopite.
 not complete	setup	sl	Ni dokončano
 not completed	setup	sl	Ni dokončano
 not ready for this stage yet	setup	sl	Sistem še ni pripravljen za ta korak.
@@ -431,7 +431,7 @@ please consult the %1.	setup	sl	Prosim, posvetujte se z %1.
 please fix the above errors (%1) and warnings(%2)	setup	sl	Prosim, popravite zgornje napake (%1) in opozorila (%2)
 please install	setup	sl	Prosim, namestite
 please login	setup	sl	Prosim, prijavite se
-please login to egroupware and run the admin application for additional site configuration	setup	sl	Prosim, da se prijavite v eGW in poženite aplikacijo Admin za dodatne nastavitve strežnika
+please login to egroupware and run the admin application for additional site configuration	setup	sl	Prosim, da se prijavite v EGw in poženite aplikacijo Admin za dodatne nastavitve strežnika
 please make the following change in your php.ini	setup	sl	Prosim, da v php.ini popravite nasednje
 please wait...	setup	sl	Prosim, počakajte...
 pop/imap mail server hostname or ip address	setup	sl	Ime ali naslov IP poštnega strežnika POP/IMAP.
@@ -450,7 +450,7 @@ re-enter password	setup	sl	Ponovite vnos gesla
 read translations from	setup	sl	Preberi prevode iz
 readable by the webserver	setup	sl	ima omogočeno branje spletnega strežnika
 really uninstall all applications	setup	sl	RES odstranim vse aplikacije
-register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off	setup	sl	Vrednost "register_globals" je nastavljena na "On", eGW NE zahteva spremembe vendar je na splošno bolj varno, če je nastavljena na "Off"
+register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off	setup	sl	Vrednost "register_globals" je nastavljena na "On", EGw NE zahteva spremembe vendar je na splošno bolj varno, če je nastavljena na "Off"
 registered	setup	sl	registriran
 rejected lines	setup	sl	Zavržene vrstice
 remove	setup	sl	Odstrani
diff --git a/setup/lang/egw_sv.lang b/setup/lang/egw_sv.lang
index 5528abba3b..183da7b5b0 100644
--- a/setup/lang/egw_sv.lang
+++ b/setup/lang/egw_sv.lang
@@ -7,7 +7,7 @@
 '%1' is not allowed as %2. arguments of option %3 !!!	setup	sv	'%1' tillåts inte som %2 argument till %3!
 (searching accounts and changing passwords)	setup	sv	(söker konton och ändrar lösenord)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	sv	Uppdatera *INTE* databasen via installationen. Uppdateringen kan avbrytas av max_execution_time vilket förstör databasen oåterkallerligt!!
-*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sv	***Du måste uppdatera php.ini manuellt (finns vanligtvis i /etc på Linux och i windows-mappen på Windows) för att eGW ska fungera.
+*** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	sv	***Du måste uppdatera php.ini manuellt (finns vanligtvis i /etc på Linux och i windows-mappen på Windows) för att EGw ska fungera.
 00 (disable)	setup	sv	00 (stäng av/rekomenderat)
 13 (ntp)	setup	sv	13 (ntp)
 80 (http)	setup	sv	80 (http)
@@ -19,7 +19,7 @@ accounts existing	setup	sv	Befintliga konton
 actions	setup	sv	Åtgärder
 activate safe password check	setup	sv	Aktivera säkra lösenords kontrollen
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	sv	Lägg till automatiskt skapade användare till denna grupp ('Default' kommer att användas om denna är tom)
-add new database instance (egw domain)	setup	sv	Lägg till ny databas instans (eGW domän)
+add new database instance (egw domain)	setup	sv	Lägg till ny databas instans (EGw domän)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	sv	Lägg till eller ändra en domän: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	sv	Lägger till, ändrar eller raderar en EGroupware domän / databas instans:
 additional options and there defaults (in brackets)	setup	sv	Övriga inställningar och deras standard (inom klammer)
@@ -157,7 +157,7 @@ current version	setup	sv	Aktuell version
 currently installed languages: %1 
	setup	sv	. Installerade språk: %1 

 cyrus imap: admin user,password	setup	sv	Cyrus IMAP: Admin användare och lösenord
 database	setup	sv	Databas
-database instance (egw domain)	setup	sv	Databas instans (eGW domän)
+database instance (egw domain)	setup	sv	Databas instans (EGw domän)
 database is version %1 and up to date.	setup	sv	Databas version %1 och är uppdaterad
 database successfully converted from '%1' to '%2'	setup	sv	Databas konverterad från '%1' till '%2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	sv	Datetime port.
Om du använder port 13, sätt brandväggsreglerna korrekt innan du trycker på Klar
(Port: 13 / Host 129.6.15.28)
@@ -266,7 +266,7 @@ hour (0-24)	setup	sv	Timme (0-24)
 however, the application is otherwise installed	setup	sv	Applikationen är ändå installerad
 however, the application may still work	setup	sv	Applikationen kanske ändå fungerar
 if no acl records for user or any group the user is a member of	setup	sv	Om inga åtkomst regler finns för användaren eller de grupper användaren är medlem av
-if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sv	Om Safe Mode är aktiverat kan inte eGW ändra vissa inställningar medans den kör, eller ladda  en modul som inte redan är laddad.
+if safe_mode is turned on, egw is not able to change certain settings on runtime, nor can we load any not yet loaded module.	setup	sv	Om Safe Mode är aktiverat kan inte EGw ändra vissa inställningar medans den kör, eller ladda  en modul som inte redan är laddad.
 if the application has no defined tables, selecting upgrade should remedy the problem	setup	sv	Om applikationen saknar definerade tabeller bör du välja att uppgradera den.
 if using ads (active directory)	setup	sv	Om AD (Active Directory) autenticering används
 if using ldap	setup	sv	Om LDAP används
@@ -308,7 +308,7 @@ ldap host	setup	sv	LDAP värd (server)
 ldap import	setup	sv	LDAP import
 ldap root password	setup	sv	LDAP root lösenord
 ldap rootdn	setup	sv	LDAP root dn
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sv	LDAP sökfilter för konton, standard: "(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	sv	LDAP sökfilter för konton, standard: "(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	sv	Lämnas tomt för att behålla befintligt
 limit access	setup	sv	Begränsa åtkomst
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	sv	Begränsa åtkomst till följande adresser, nätverk eller hostnamn (dvs 127.0.0.1,192.168.1,frodo.mydomain.org
diff --git a/setup/lang/egw_zh-tw.lang b/setup/lang/egw_zh-tw.lang
index 28707e033a..6845ac2a0f 100644
--- a/setup/lang/egw_zh-tw.lang
+++ b/setup/lang/egw_zh-tw.lang
@@ -20,7 +20,7 @@ accounts existing	setup	zh-tw	帳號已經存在
 actions	setup	zh-tw	動作
 activate safe password check	setup	zh-tw	啟用儲存密碼功能
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	zh-tw	新增自動建立使用者到這個群組﹝若留空白則使用「Default」﹞
-add new database instance (egw domain)	setup	zh-tw	新增資料庫實例(eGW 網域)
+add new database instance (egw domain)	setup	zh-tw	新增資料庫實例(EGw 網域)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	zh-tw	新增或編輯一個網域：
 adding, editing or deleting an egroupware domain / database instance:	setup	zh-tw	新增、編輯或刪除一個 EGroupware 網域/資料庫實例：
 additional options and there defaults (in brackets)	setup	zh-tw	附加選項與預設（同時處理）
@@ -304,7 +304,7 @@ ldap host	setup	zh-tw	LDAP 主機
 ldap import	setup	zh-tw	LDAP匯入
 ldap root password	setup	zh-tw	LDAP 管理者密碼
 ldap rootdn	setup	zh-tw	LDAP 主要端點﹝rootdn﹞
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	zh-tw	LDAP帳號搜尋規則，預設："(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	zh-tw	LDAP帳號搜尋規則，預設："(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	zh-tw	空白表示不改變
 limit access	setup	zh-tw	存取限制
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	zh-tw	限制下面位址、網域或是主機存取安裝設定(例如：127.0.0.1,10.1.1,myhost.dnydns.org)
diff --git a/setup/lang/egw_zh.lang b/setup/lang/egw_zh.lang
index 844a979732..27d4397dc2 100644
--- a/setup/lang/egw_zh.lang
+++ b/setup/lang/egw_zh.lang
@@ -21,7 +21,7 @@ accounts existing	setup	zh	帐户已存在
 actions	setup	zh	操作
 activate safe password check	setup	zh	启用安全密码校验
 add auto-created users to this group ('default' will be attempted if this is empty.)	setup	zh	自动添加用户到该组 (如果留空则'默认'添加。)
-add new database instance (egw domain)	setup	zh	添加数据库实例 (eGW 域)
+add new database instance (egw domain)	setup	zh	添加数据库实例 (EGw 域)
 add or edit a domain: [domain-name(default)],[db-name(egroupware)],[db-user(egroupware)],db-password,[db-type(mysql)],[db-host(localhost)],[db-port(db specific)],[config-user(as header)],[config-passwd(as header)]	setup	zh	添加或编辑域：[域名(默认)],[数据库名(egroupware)],[数据库帐号(egroupware)],数据库密码,[数据库类型(mysql)],[数据库主机(localhost)],[数据库端口(据 db 而定)],[用户名(同 header)],[密码(同 header)]
 adding, editing or deleting an egroupware domain / database instance:	setup	zh	添加、编辑或删除一个 EGroupware 域/数据库实例：
 additional options and there defaults (in brackets)	setup	zh	附加选项及其默认设置 (括号内)
@@ -161,7 +161,7 @@ current version	setup	zh	当前版本号
 currently installed languages: %1 
	setup	zh	当前已安装的语言：%1

 cyrus imap: admin user,password	setup	zh	Cyrus IMAP: Admin user,Password
 database	setup	zh	Database
-database instance (egw domain)	setup	zh	数据库实例 (eGW 域)
+database instance (egw domain)	setup	zh	数据库实例 (EGw 域)
 database is version %1 and up to date.	setup	zh	数据库版本为 %1 ，是最新版本
 database successfully converted from '%1' to '%2'	setup	zh	已成功将数据库'%1'转换为'%2'
 datetime port.
if using port 13, please set firewall rules appropriately before submitting this page.
(port: 13 / host: 129.6.15.28)	setup	zh	数据库端口。
如果使用13号端口，用请在提交之前设置正确的防火墙规则。
(例如端口号：13/主机：129.6.15.28)
@@ -315,7 +315,7 @@ ldap host	setup	zh	LDAP 主机
 ldap import	setup	zh	LADP 导入
 ldap root password	setup	zh	LDAP root 密码
 ldap rootdn	setup	zh	LDAP rootdn ("cn=root, o=yourdomain, c=us")
-ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	zh	LDAP 帐户搜索过滤器，默认："(uid=%user)", %domain=eGW-domain
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	zh	LDAP 帐户搜索过滤器，默认："(uid=%user)", %domain=EGw-domain
 leave empty to keep current.	setup	zh	留空保持当前。
 limit access	setup	zh	访问限制
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	zh	限制以下地址对安装程序的访问 (如：127.0.0.1,10.0.0.1,myhost.dnydns,org)
diff --git a/setup/manageheader.php b/setup/manageheader.php
index bc18d9a1dd..b0bce68601 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -1,6 +1,6 @@
 html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
 		$GLOBALS['egw_setup']->html->show_alert_msg('Error',
-			lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',
+			lang('You are using PHP version %1. EGroupware now requires %2 or later, recommended is PHP %3.',
 			PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
 		$GLOBALS['egw_setup']->html->show_footer();
 		exit;
@@ -243,7 +243,7 @@ function show_header_form($validation_errors)
 		echo '
'
 			. lang('Did not find any valid DB support!')
 			. "
\n"
-			. lang('Try to configure your php to support one of the above mentioned DBMS, or install eGroupWare by hand.')
+			. lang('Try to configure your php to support one of the above mentioned DBMS, or install EGroupware by hand.')
 			. '
';
 		$GLOBALS['egw_setup']->html->show_footer();
 		exit;
@@ -342,11 +342,11 @@ function show_header_form($validation_errors)
 	$setup_tpl->set_var(array(
 		'lang_analysis'        => $validation_errors ? lang('Validation errors') : '',
 		'lang_settings'        => lang('Settings'),
-		'lang_domain'          => lang('Database instance (eGW domain)'),
+		'lang_domain'          => lang('Database instance (EGw domain)'),
 		'lang_delete'          => lang('Delete'),
-		'lang_adddomain'       => lang('Add new database instance (eGW domain)'),
+		'lang_adddomain'       => lang('Add new database instance (EGw domain)'),
 		'lang_serverroot'      => lang('Server Root'),
-		'lang_serverroot_descr'=> lang('Path (not URL!) to your eGroupWare installation.'),
+		'lang_serverroot_descr'=> lang('Path (not URL!) to your EGroupware installation.'),
 		'lang_adminuser'       => lang('Header username'),
 		'lang_adminuser_descr' => lang('Admin user for header manager'),
 		'lang_adminpass'       => lang('Header password'),
@@ -363,11 +363,11 @@ function show_header_form($validation_errors)
 		'lang_dbname'          => lang('DB Name'),
 		'lang_dbnamedescr'     => lang('Name of database'),
 		'lang_dbuser'          => lang('DB User'),
-		'lang_dbuserdescr'     => lang('Name of db user eGroupWare uses to connect'),
+		'lang_dbuserdescr'     => lang('Name of db user EGroupware uses to connect'),
 		'lang_dbpass'          => lang('DB Password'),
 		'lang_dbpassdescr'     => lang('Password of db user'),
 		'lang_dbtype'          => lang('DB Type'),
-		'lang_whichdb'         => lang('Which database type do you want to use with eGroupWare?'),
+		'lang_whichdb'         => lang('Which database type do you want to use with EGroupware?'),
 		'lang_configuser'      => lang('Configuration User'),
 		'lang_configuser_descr'=> lang('Loginname needed for domain configuration'),
 		'lang_configpass'      => lang('Configuration Password'),
@@ -377,7 +377,7 @@ function show_header_form($validation_errors)
 		'lang_session'         => lang('Sessions Handler'),
 		'lang_session_descr'   => lang('Session handler class used.'),
 		'lang_enablemcrypt'    => lang('Enable MCrypt'),
-		'lang_mcrypt_warning'  => lang('Not all mcrypt algorithms and modes work with eGroupWare. If you experience problems try switching it off.'),
+		'lang_mcrypt_warning'  => lang('Not all mcrypt algorithms and modes work with EGroupware. If you experience problems try switching it off.'),
 		'lang_mcryptiv'        => lang('MCrypt initialization vector'),
 		'lang_mcryptivdescr'   => lang('This should be around 30 bytes in length.
Note: The default has been randomly generated.'),
 		'lang_domselect'       => lang('Domain select box on login'),
diff --git a/setup/schematoy.php b/setup/schematoy.php
index a87789e35b..0bba7b3057 100644
--- a/setup/schematoy.php
+++ b/setup/schematoy.php
@@ -1,6 +1,6 @@
 
 
    
-    {lang_LDAP_search_filter_for_accounts,_default:_"(uid=%user)",_%domain=eGW-domain}:
+    {lang_LDAP_search_filter_for_accounts,_default:_"(uid=%user)",_%domain=EGw-domain}:
     
    
 
diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index 3e9abf31f4..e044c255b3 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -1,7 +1,7 @@
 
 
 	
-		eGroupWare Setup - {lang_setup} {configdomain}
+		EGroupware Setup - {lang_setup} {configdomain}