Index: /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php	(revision 309)
@@ -89,16 +89,14 @@
 				'add_action'			=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uigroups.add_groups'),
 				'add_group_disabled'	=> $this->functions->check_acl($account_lid,'add_groups') ? '' : 'disabled',
+				//'context'				=> $context,
 				'context_display'		=> $context_display,
-
-				'lang_groups_names'		=> lang('Group name'),
+				'lang_groups_names'		=> lang('Groups Names'),
 				'lang_description'		=> lang('Description'),
-				'lang_add_groups'		=> lang('Create group'),
+				'lang_add_groups'		=> lang('Add Groups'),
 				'lang_edit'  			=> lang('Edit'),
 				'lang_delete'			=> lang('Delete'),
-				'lang_delete_group'		=> lang('Delete group?'),
-				'lang_back'			=> lang('Back'),
-				'lang_context'			=> lang('Context'),
-				'lang_users'			=> lang('Users'),
-				'lang_search'			=> lang('Search')
+				'lang_back'				=> lang('back'),
+				'lang_context'			=> lang('context'),
+				'lang_search'			=> lang('search')
 			);
 			$p->set_var($var);
@@ -112,10 +110,11 @@
 				$groups_info = $this->functions->get_list('groups', $GLOBALS['query'], $contexts);
 			}
-
-			if (!count($groups_info) && $GLOBALS['query'] != '')
+			$total = count($groups_info);
+
+			if (!count($total) && $GLOBALS['query'] != '')
 			{
 				$p->set_var('message',lang('No matches found'));
 			}
-			else if (count($groups_info))
+			else if ($total)
 			{
 				if ($this->functions->check_acl($account_lid,'edit_groups'))
@@ -149,5 +148,5 @@
 					if ($can_delete)
 					{
-						$p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'>".lang('Delete')."</a>");
+						$p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'>Excluir</a>");
 					}
 					else
@@ -160,4 +159,5 @@
 			}
 			$p->parse('rows','row_empty',True);
+			$p->set_var($var);
 
 			if (! $GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
@@ -190,5 +190,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create group');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Group');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -232,6 +232,21 @@
 				'ldap_context'				=> $GLOBALS['phpgw_info']['server']['ldap_context'],
 				'ufn_ldap_context'			=> ldap_dn2ufn($GLOBALS['phpgw_info']['server']['ldap_context']),
+				'lang_back'					=> lang('Back'),
+				'lang_save'					=> lang('save'),
+				'lang_group_organization'	=> lang('Group Organization'),
+				'lang_search_organization'	=> lang('Search Organiztion'),
+				'lang_org'					=> lang('Organizations'),
+				'lang_group_name'			=> lang('group name'),
+				'lang_description'			=> lang('Description'),
+				'lang_email'				=> lang('E-mail'),
 				'concatenateDomain'			=> $this->current_config['expressoAdmin_concatenateDomain'],
 				'defaultDomain'				=> $this->current_config['expressoAdmin_defaultDomain'],
+				'lang_group_users'			=> lang('Group users'),
+				'lang_applications'			=> lang('Applications'),
+				'lang_add_user'				=> lang('Add User'),
+				'lang_rem_user'				=> lang('Remove User'),
+				'lang_all_users'			=> lang('Select users from all sub-organizations'),
+				'apps'						=> $apps,
+				//'use_attrs_samba_checked'	=> $this->current_config['expressoAdmin_samba_support'] == 'true' ? 'CHECKED' : '',
 				'use_attrs_samba_checked'	=> '',
 				'disabled_samba'			=> 'disabled',
@@ -241,33 +256,5 @@
 				'back_url'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uigroups.list_groups'),
 				'combo_manager_org'			=> $combo_manager_org,
-				'combo_all_orgs'			=> $combo_all_orgs,
-				'apps'				=> $apps,
-
-				'lang_back'			=> lang('Back'),
-				'lang_save'			=> lang('Save'),
-				'lang_group_organization'	=> lang('Group organization'),
-				'lang_search_organization'	=> lang('Search organization'),
-				'lang_group_name'		=> lang('Group name'),
-				'lang_description'		=> lang('Description'),
-				'lang_email'			=> lang('E-mail'),
-                                'lang_users'                    => lang('Available users'),
-                                'lang_organization'             => lang('Organizations'),
-				'lang_group_users'		=> lang('Selected users'),
-				'lang_applications'		=> lang('Applications'),
-				'lang_add_user'			=> lang('Add user'),
-				'lang_search_user'		=> lang('Search user'),
-				'lang_domain'			=> lang('Samba domain'),
-				'lang_rem_user'			=> lang('Remove user'),
-				'lang_invisible_group'		=> lang('Hidden group'),
-				'lang_all_users'		=> lang('Show users from all sub-organizations'),
-				'group_name_field_is_empty'     => lang('Group name field is empty'),
-				'description_field_is_empty'    => lang('Description field is empty'),
-				'group_name_field_not_allowed'  => lang('Group name field contains invalid characters'),
-				'description_field_not_allowed' => lang('Description field contains invalid characters'),
-				'group_successfully_created'    => lang('Group successfully created!'),
-				'not_possible_select_all_users' => lang('It is impossible to create a group with all organization users'),
-				'field_email_is_invalid'        => lang('E-mail field is invalid'),
-				'lang_samba_attributes'         => lang('Use Samba attributes'),
-				'field_name_is_incomplete'      => lang("The group's name field is incomplete. The group's name must be in the following format: grupo-organization-name. Ex: grupo-celepar-rh")
+				'combo_all_orgs'			=> $combo_all_orgs
 			);
 			$p->set_var($var);
@@ -295,5 +282,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit group');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Group');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -315,8 +302,8 @@
 					if ($user_data['uidnumber'])
 					{
-					$array_users[$user_data['uidnumber']] = $user_data['cn'];
-					$array_users_uid[$user_data['uidnumber']] = $uid;
-					$array_users_type[$user_data['uidnumber']] = $user_data['type'];
-				}
+						$array_users[$user_data['uidnumber']] = $user_data['cn'];
+						$array_users_uid[$user_data['uidnumber']] = $uid;
+						$array_users_type[$user_data['uidnumber']] = $user_data['type'];
+					}
 					else
 					{
@@ -366,6 +353,23 @@
 			// Seta variaveis utilizadas pelo tpl.
 			$var = Array(
-				'restrictionsOnGroup'           => $this->current_config['expressoAdmin_restrictionsOnGroup'],
+				'color_bg1'					=> "#E8F0F0",
+				'color_bg2'					=> "#D3DCE3",
+				'type'						=> 'edit_group',
+				'ldap_context'				=> $GLOBALS['phpgw_info']['server']['ldap_context'],
+				'lang_back'					=> lang('Back'),
+				'lang_save'					=> lang('save'),
+				'lang_group_organization'	=> lang('Group Organization'),
+				'lang_search_organization'	=> lang('Search Organiztion'),
+				'lang_org'					=> lang('Organizations'),
+				'lang_group_name'			=> lang('group name'),
+				'lang_description'			=> lang('Description'),
+				'lang_email'				=> lang('E-mail'),
+				'lang_group_users'			=> lang('Group users'),
+				'lang_applications'			=> lang('Applications'),
+				'lang_add_user'				=> lang('Add User'),
+				'lang_rem_user'				=> lang('Remove User'),
+				'lang_all_users'			=> lang('Select users from all sub-organizations'),
 				'gidnumber'					=> $group_info['gidnumber'],
+				//'manager_context'			=> $manager_context,
 				'cn'						=> $group_info['cn'],
 				'user_count'				=> $user_count,
@@ -381,37 +385,5 @@
 				'combo_manager_org'			=> $combo_manager_org,
 				'combo_all_orgs'			=> $combo_all_orgs,
-				'ea_select_usersInGroup'	=> $ea_select_usersInGroup,
-				'color_bg1'			=> "#E8F0F0",
-				'color_bg2'			=> "#D3DCE3",
-				'type'				=> 'edit_group',
-				'ldap_context'			=> $GLOBALS['phpgw_info']['server']['ldap_context'],
-
-				'lang_back'			=> lang('Back'),
-				'lang_save'			=> lang('Save'),
-				'lang_group_organization'	=> lang('Group organization'),
-				'lang_search_organization'	=> lang('Search organization'),
-				'lang_group_name'		=> lang('Group name'),
-				'lang_description'		=> lang('Description'),
-				'lang_email'			=> lang('E-mail'),
-				'lang_group_users'		=> lang('Selected users'),
-				'lang_applications'		=> lang('Applications'),
-				'lang_add_user'			=> lang('Add user'),
-				'lang_rem_user'			=> lang('Remove user'),
-                                'lang_search_user'              => lang('Search user'),
-                                'lang_domain'                   => lang('Domain'),
-				'lang_invisible_group'		=> lang('Hidden group'),
-                                'lang_users'                   	=> lang('Available users'),
-                                'lang_organization'             => lang('Organizations'),
-				'lang_all_users'		=> lang('Show users from all sub-organizations'),
-				'group_name_field_is_empty'     => lang('Group name field is empty'),
-				'description_field_is_empty'    => lang('Description field is empty'),
-				'group_name_field_not_allowed'  => lang('Group name field contains invalid characters'),
-				'description_field_not_allowed' => lang('Description field contains invalid characters'),
-				'group_successfully_saved'      => lang('Group successfully saved!'),
-				'not_possible_select_all_users' => lang('It is impossible to create a group with all organization users'),
-				'group_successfully_deleted'    => lang('Group successfully deleted!'),
-				'field_email_is_invalid'        => lang('E-mail field is invalid'),
-				'lang_samba_attributes'         => lang('Use Samba attributes'),
-                                'field_name_is_incomplete'      => lang("The group's name field is incomplete. The group's name must be in the following format: grupo-organization-name. Ex: grupo-celepar-rh")
+				'ea_select_usersInGroup'	=> $ea_select_usersInGroup
 			);
 			$p->set_var($var);
Index: /trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php	(revision 309)
@@ -92,4 +92,5 @@
 				'bg_color'					=> $GLOBALS['phpgw_info']['theme']['bg_color'],
 				'th_bg'						=> $GLOBALS['phpgw_info']['theme']['th_bg'],
+				
 				'accounts_url'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'),
 				'back_url'					=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
@@ -101,20 +102,15 @@
 				'imapDelimiter'				=> $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 
 				
-				'lang_create_user'			=> lang('Create user'),
-				'lang_loginid'				=> lang('Login'),
+				'lang_create_user'			=> lang('Create User'),
+				'lang_loginid'				=> lang('LoginID'),
 				'lang_cn'					=> lang('Name'),
 				'lang_mail'					=> lang('E-mail'),
-				'lang_edit'				=> lang('Edit'),
-				'lang_rename'				=> lang('Rename'),
+				'lang_edit'					=> lang('edit'),
+				'lang_rename'				=> lang('rename'),
+				'lang_delete'				=> lang('delete'),
 				'lang_search'				=> lang('Search'),
-				'lang_back'				=> lang('Back'),
-				'lang_contexts'				=> lang('Contexts'),
-				'lang_delete_user'			=> lang('Delete user?'),
-				'lang_delete'				=> lang('Delete'),
-				'lang_sucess'				=> lang('User deleted successfully!'),				
-				'lang_rename_user'			=> lang('Rename user'),				
-				'lang_rename_success'			=> lang('User renamed successfully!'),				
-				'login_field_contains_not_allowed'      => lang('Login field contains invalid characters'),
-				'lang_to'				=> lang('to:')				
+				'lang_back'					=> lang('back'),
+				'lang_contexts'				=> lang('Contexts')
+				
 			);
 			$p->set_var($var);
@@ -169,5 +165,5 @@
 
 					if ($can_rename)
-						$p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>".lang('Rename')."</a>");
+						$p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>Renomear</a>");
 					else
 						$p->set_var('row_rename','&nbsp;');
@@ -175,5 +171,5 @@
 					if ($can_delete)
 					{
-						$p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>".lang('Delete')."</a>");
+						$p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>Excluir</a>");
 					}
 					else
@@ -217,5 +213,4 @@
 			$t->set_file(array("body" => "accounts_form.tpl"));
 			$t->set_block('body','main');
-				
 
 			// Pega combo das organizações e seleciona, caso seja um post, o setor que o usuario selecionou.
@@ -245,37 +240,36 @@
 			// Valores default.
 			$var = Array( 
-				'back_url'			=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'),
-				'photo_bin'	=> $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png',
 				'row_on'				=> "#DDDDDD",
 				'row_off'				=> "#EEEEEE",
 				'color_bg1'				=> "#E8F0F0",
+				//'manager_context'		=> $manager_context,
 				'type'					=> 'create_user',
+				'back_url'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'),
 				'display_samba_suport'	=> $this->current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'none',
-				'disabled_access_button'		=> 'disabled',
-				'display_access_records' 		=> 'none',
+				'disabled_access_button'=> 'disabled',
 				
 				// First ABA
 				'display_spam_uid'				=> 'display:none',
-				'lang_general_information'		=> lang('General information'),
-				'lang_corporative_information'		=> lang('Corporative information'),
-				'lang_email_config'			=> lang('E-mail config'),
-				'lang_groups_permission'		=> lang('Group permissions'),
-				'lang_lists_permission'			=> lang('E-mail lists'),
-				'lang_aplication_permission'		=> lang('Application permissions'),	
-				'lang_search_organization'		=> lang('Search organization'),
+				'lang_general_information'		=> lang('General Information'),
+				'lang_corporative_information'	=> lang('Corporative Information'),
+				'lang_email_config'				=> lang('Email Config'),
+				'lang_groups_permission'		=> lang('Groups Permission'),
+				'lang_lists_permission'			=> lang('Email Lists'),
+				'lang_aplication_permission'	=> lang('Aplication Permission'),	
+				'lang_search_organization'		=> lang('Search Organiztion'),
 				'lang_organizations'			=> lang('Organizations'),
 				'lang_sector'					=> lang('Sector'),
-				'lang_account_lid'			=> lang('Login'),
-				'lang_firstname'			=> lang('First name'),
-				'lang_lastname'				=> lang('Last name'),
+				'lang_account_lid'				=> lang('Login ID'),
+				'lang_firstname'				=> lang('First Name'),
+				'lang_lastname'					=> lang('Last Name'),
 				'lang_password'					=> lang('Password'),
-				'lang_re-password'			=> lang('Re-password'),
+				'lang_re-password'				=> lang('Re-Password'),
 				'lang_passwd_expired'			=> lang('Password expired'),
 				'lang_changepassword'			=> lang('Change password'),				
 				'lang_phone'					=> lang('Phone'),
 				'lang_photo'					=> lang('Photo'),
-				'lang_account_active'			=> lang('Enabled account'),
-				'lang_account_invisible'		=> lang('Hidden account'),
-				'lang_never'				=> lang('Never'),
+				'lang_account_active'			=> lang('Account Active'),
+				'lang_account_invisible'		=> lang('Account Invisible'),
+				'lang_never'					=> lang('never'),
 				'lang_back'						=> lang('Back'),
 				'lang_save'						=> lang('Save'),
@@ -286,4 +280,5 @@
 				'changepassword_checked'		=> 'CHECKED',
 				'phpgwaccountstatus_checked'	=> 'CHECKED',
+				'photo_bin'						=> $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png',
 				'display_picture'				=> $this->functions->check_acl($manager_lid,'edit_users_picture') ? '' : 'none', 
 				'display_tr_default_password'	=> 'none',
@@ -296,17 +291,17 @@
 				'display_corporative_information' => $this->functions->check_acl($manager_lid,'manipulate_corporative_information') ? '' : 'none',
 				'lang_employeenumber'			=> lang('Employee number'),
-				'lang_cpf'				=> lang('CPF'),
-				'lang_rg'				=> lang('RG'),
-				'lang_rguf'				=> lang('RG UF'),
+				'lang_cpf'						=> lang('cpf'),
+				'lang_rg'						=> lang('rg'),
+				'lang_rguf'						=> lang('rguf'),
 				
 				//MAIL
-				'lang_activeemailaccount'		=> lang('Active e-mail account'),
+				'lang_activeemailaccount'		=> lang('Active email account'),
 				'lang_email'					=> lang('E-mail'),
-				'lang_aliasemail'			=> lang('E-mail alias'),
-				'lang_forwardingemail'			=> lang('Forwarding e-mail'),
-				'lang_email_quota'			=> lang('E-mail quota in MB'),
+				'lang_aliasemail'				=> lang('Alias email'),
+				'lang_forwardingemail'			=> lang('Forwarding email'),
+				'lang_email_quota'				=> lang('Email quota in MB'),
 				'lang_onlyforwarding'			=> lang('Only forwarding'),
-				'lang_quote_message'			=> lang('Leave empty for no quota'),
-				'lang_email_quota_used'			=> lang('Used quota in MB'),
+				'lang_quote_message'			=> lang('leave empty for no quota'),
+				'lang_email_quota_used'			=> lang('Quota used in MB'),
 				'accountstatus_checked'			=> 'CHECKED',
 				'mailquota'						=> $this->current_config['expressoAdmin_defaultUserQuota'],
@@ -318,14 +313,14 @@
 				//Third ABA
 				'lang_groups'					=> lang('Groups'),
-				'lang_user_groups'			=> lang('Selected user groups'),
-				'lang_available_groups'			=> lang('Available groups'),
-				'lang_listGroups'			=> lang('List groups'),
-				'lang_primary_group'			=> lang('Primary group'),
+				'lang_user_groups'				=> 'Grupos do Usuário',
+				'lang_available_groups'			=> 'Grupos disponíveis',
+				'lang_listGroups'				=> lang('ListGroups'),
+				'lang_primary_group'			=> lang('Primary Group'),
 				'lang_add'						=> lang('Add'),
 				'lang_rem'						=> lang('Remove'),
 				
 				//Fourd ABA
-				'lang_user_mail_lists'			=> lang('Selected e-mail lists'),
-				'lang_available_mail_lists'		=> lang('Available e-mail lists'),
+				'lang_user_mail_lists'			=> 'O usuário participa destas Listas de E-mail',
+				'lang_available_mail_lists'		=> 'Listas de E-mail disponíveis',
 				
 				//Five ABA
@@ -333,60 +328,16 @@
 				
 				//SAMBA ABA
-				'lang_samba_config'			=> lang('Samba config'),
-				'lang_use_attrs_samba'			=> lang('Use Samba attributes'),
+				'lang_samba_config'					=> lang('Samba Config'),
+				'lang_use_attrs_samba'				=> lang('Use samba attributes'),
 				'lang_sambadomain'					=> lang('Domain'),
-				'lang_sambaAcctFlags'			=> lang('Samba account flags'),
-				'lang_sambaLogonScript'			=> lang('Logon script'),
-				'lang_sambaHomeDirectory'		=> lang('Home directory'),
-				'lang_active_user'			=> lang('Enabled Samba user'),
-				'lang_desactive_user'			=> lang('Disabled Samba user'),
+				'lang_sambaAcctFlags'				=> lang('AcctFlags'),
+				'lang_sambaLogonScript'				=> lang('Logon Script'),
+				'lang_sambaHomeDirectory'			=> lang('Home Directory'),
+				'lang_active_user'					=> lang('Samba User Active'),
+				'lang_desactive_user'				=> lang('Samba User Desactive'),
 				'use_attrs_samba_checked'			=> 'CHECKED',
 				'sambadomainname_options'			=> $sambadomainname_options,
 				'sambalogonscript'					=> $this->current_config['expressoAdmin_defaultLogonScript'] != '' ? $this->current_config['expressoAdmin_defaultLogonScript'] : '',
 				'use_suggestion_in_logon_script'	=> $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false',
-
-				'login_field_empty'			=> lang('Login field is empty'),
-				'login_field_must_have'			=> lang('Login field must have more than'),
-				'characters'				=> lang('characters'),
-				'password_field_empty'			=> lang('Password field is empty'),
-				're-pass_field_empty'			=> lang('Re-password field is empty'),
-				'pass_re-pass_diferents'		=> lang('Password and Re-password are differentes'),
-				'register_field_contains_not_allowed'	=> lang('Field register contains invalid characters. Only numbers are allowed'),
-				'cpf_field_not_allowed'			=> lang('Field CPF contains invalid characters. Only numbers are allowed'),
-				'email_field_empty'			=> lang('Email field is empty'),
-				'first_name_empty'			=> lang('First name field is empty'),
-				'first_name_not_valid' 	 		=> lang('First name field is invalid'),
-				'last_name_empty'			=> lang('Last name field is empty'),
-				'last_name_not_valid'   		=> lang('Last name field is not valid'),
-				'telephone_empty'			=> lang('Telephone field is empty'),
-				'redirect_email_empty'			=> lang('Redirect email field is empty'),
-				'without_quota'				=> lang('User without quota'),
-				'no_group_selected'			=> lang('No groups selected'),
-				'user_logon_script_empty'		=> lang('User logon script is empty'),
-				'user_home_path_empty'			=> lang('User home path is empty'),
-				'user_successfully_created'		=> lang('User successfully created!'),
-				'user_successfully_saved'		=> lang('User successfully saved!'),
-				'default_password_registered'		=> lang('Default password successfully registered'),
-				'user_password_returned_with_success'	=> lang('User password returned with success'),
-				'user_deleted_with_success'		=> lang('User deleted successfully!'),
-				'login_field_contains_not_allowed'	=> lang('Login field contains not allowed characters'),
-				'page_not_found'			=> lang('Page Not Found!'),
-				'type_name_new_manager'			=> lang('Type in the new managers name'),
-				'email_field_not_valid'			=> lang('E-mail field is invalid'),
-				'searching'				=> lang('Searching...'),
-				'delete_the_list'			=> lang('Delete list '),
-				'delete_the_group'			=> lang('Delete group '),
-				'cpf_invalid_field' 			=> lang('Invalid CPF field'),
-				'incorrect_telephone_field'		=> lang('Incorrect Telephone Field'),
-				'change_user_login'			=> lang('Change user login'),
-				'to'					=> lang('to'),			
-				'removed'				=> lang('removed'),
-				'lang_search_group'             	=> lang('Search group'),
-				'lang_search_list'             		=> lang('Search list'),
-				'lang_clear_inbox_user'         	=> lang('Clear'),
-				'lang_inbox_user'    	  	   	=> lang('User inbox'),
-				'display_tr_inbox_user'			=> 'none',
-				'lang_access_records'           	=> lang('Show access records'),
-				'cpf_field_invalid'  	         	=> lang('CPF field is invalid')
 			);
 			$t->set_var($var);
@@ -471,5 +422,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit user');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit User');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -517,5 +468,5 @@
 
 						if ($alert_warning == '')
-							$alert_warning = lang("The ExpressoAdmin fixed the following inconsistencies:\n");
+							$alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n";
 						$alert_warning .= "Incluido atributo memberUid do usuário no grupo:\\n$cn - gidnumber: $gidnumber.";
 					}
@@ -656,27 +607,26 @@
 				'alert_warning'					=> "$alert_warning",
 				'display_input_account_lid'		=> 'display:none',
-				'lang_general_information'	=> lang('General information'),
-				'lang_corporative_information'	=> lang('Corporative information'),
-				'lang_email_config'		=> lang('E-mail config'),
-				'lang_groups_permission'	=> lang('Group permissions'),
-				'lang_lists_permission'		=> lang('E-mail lists'),
-				'lang_aplication_permission'	=> lang('Application permissions'),	
+				'lang_general_information'		=> lang('General Information'),
+				'lang_corporative_information'	=> lang('Corporative Information'),
+				'lang_email_config'				=> lang('Email Config'),
+				'lang_groups_permission'		=> lang('Groups Permission'),
+				'lang_lists_permission'			=> lang('Email Lists'),
+				'lang_aplication_permission'	=> lang('Aplication Permission'),	
 				'lang_organizations'			=> lang('Organizations'),
-				'lang_search_organization'	=> lang('Search organization'),
+				'lang_search_organization'		=> lang('Search Organiztion'),
 				'lang_sector'					=> lang('Sector'),
-				'lang_account_lid'		=> lang('Login'),
-				'lang_firstname'		=> lang('First name'),
-				'lang_lastname'			=> lang('Last name'),
+				'lang_account_lid'				=> lang('Login ID'),
+				'lang_firstname'				=> lang('First Name'),
+				'lang_lastname'					=> lang('Last Name'),
 				'lang_passwd_expired'			=> lang('Password expired'),
 				'lang_password'					=> lang('Password'),
 				'lang_phone'					=> lang('Phone'),
 				'lang_photo'					=> lang('Photo'),
-				'lang_re-password'		=> lang('Re-password'),
+				'lang_re-password'				=> lang('Re-Password'),
 				'lang_changepassword'			=> lang('Change password'),				
-				'lang_account_active'		=> lang('Enabled account'),
-				'lang_account_invisible'	=> lang('Hidden account'),
+				'lang_account_active'			=> lang('Account Active'),
+				'lang_account_invisible'		=> lang('Account Invisible'),
 				'lang_back'						=> lang('Back'),
 				'lang_save'						=> lang('Save'),
-				'lang_delete_photo'    	 	=> lang('Delete photo'),
 				
 				'sectors'						=> $combo_manager_org,
@@ -703,9 +653,7 @@
 				// Corporative Information
 				'lang_employeenumber'			=> lang('Employee number'),
-				'lang_cpf'			=> lang('CPF'),
-				'lang_rg'			=> lang('RG'),
-				'lang_rguf'			=> lang('RG UF'),
-				'cpf_field_invalid'             => lang('CPF field is invalid'),
-
+				'lang_cpf'						=> lang('cpf'),
+				'lang_rg'						=> lang('rg'),
+				'lang_rguf'						=> lang('rguf'),
 				'corporative_information_employeenumber' => $user_info['corporative_information_employeenumber'],
 				'corporative_information_cpf'			=> $user_info['corporative_information_cpf'],
@@ -715,15 +663,11 @@
 				//MAIL
 				'disabled_quota_used'		=> 'disabled',
-				'lang_activeemailaccount'	=> lang('Active e-mail account'),
+				'lang_activeemailaccount'	=> lang('Active email account'),
 				'lang_email'				=> lang('E-mail'),
-				'lang_aliasemail'		=> lang('E-mail alias'),
-				'lang_forwardingemail'		=> lang('Forwarding e-mail'),
-				'lang_email_quota'		=> lang('E-mail quota in MB'),
+				'lang_aliasemail'			=> lang('Alias email'),
+				'lang_forwardingemail'		=> lang('Forwarding email'),
+				'lang_email_quota'			=> lang('Email quota in MB'),
 				'lang_onlyforwarding'		=> lang('Only forwarding'),
-				'lang_email_quota_used'		=> lang('Used quota in MB'),
-				'lang_clear_inbox_user'         => lang('Clear'),
-                                'lang_inbox_user'               => lang('User inbox'),
-                                'display_tr_inbox_user'         => '',
-
+				'lang_email_quota_used'		=> lang('Quota used in MB'),
 				
 				'accountstatus_checked'		=> $user_info['accountstatus'] == 'active' ? 'CHECKED' : '',
@@ -733,7 +677,8 @@
 				//'mailforwardingaddress'		=> $user_info['mailforwardingaddress'],
 				'input_mailalternateaddress_fields'	=> $input_mailalternateaddress_fields,
-				'input_mailforwardingaddress_fields'	=> $input_mailforwardingaddress_fields,
+				'input_mailforwardingaddress_fields'=> $input_mailforwardingaddress_fields,
 				
 				'deliverymode_checked'		=> $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '',
+				
 				'mailquota'					=> $user_info['mailquota'],
 				'mailquota_used'			=> $user_info['mailquota_used'],
@@ -741,7 +686,7 @@
 				//Third ABA
 				'lang_groups'				=> lang('Groups'),
-                                'lang_user_groups'                      => lang('Selected user groups'),
-                                'lang_available_groups'                 => lang('Available groups'),
-				'lang_primary_group'			=> lang('Primary group'),
+				'lang_user_groups'			=> 'Grupos do Usuário',
+				'lang_available_groups'		=> 'Grupos disponíveis',
+				'lang_primary_group'		=> lang('Primary Group'),
 				'lang_add'					=> lang('Add'),
 				'lang_rem'					=> lang('Remove'),
@@ -750,6 +695,6 @@
 				
 				//Fourd ABA
-				'lang_user_mail_lists'                  => lang('Selected e-mail lists'),
-                                'lang_available_mail_lists'             => lang('Available e-mail lists'),
+				'lang_user_mail_lists'			=> 'O usuário participa destas Listas de E-mail',
+				'lang_available_mail_lists'		=> 'Listas de E-mail disponíveis',
 				'ea_select_user_maillists_options'  => $ea_select_user_maillists_options,
 								
@@ -758,12 +703,12 @@
 
 				//SAMBA ABA
-				'lang_samba_config'		=> lang('Samba config'),
-				'lang_use_attrs_samba'		=> lang('Use Samba attributes'),
+				'lang_samba_config'			=> lang('Samba Config'),
+				'lang_use_attrs_samba'		=> lang('Use samba attributes'),
 				'lang_sambadomain'			=> lang('Domain'),
-				'lang_sambaAcctFlags'		=> lang('Samba account flags'),
-				'lang_sambaLogonScript'		=> lang('Logon script'),
-				'lang_sambaHomeDirectory'	=> lang('Home directory'),
-				'lang_active_user'		=> lang('Enabled Samba user'),
-				'lang_desactive_user'		=> lang('Disabled Samba user'),
+				'lang_sambaAcctFlags'		=> lang('AcctFlags'),
+				'lang_sambaLogonScript'		=> lang('Logon Script'),
+				'lang_sambaHomeDirectory'	=> lang('Home Directory'),
+				'lang_active_user'			=> lang('Samba User Active'),
+				'lang_desactive_user'		=> lang('Samba User Desactive'),
 				
 				'userSamba'					=> $user_info['sambaUser'],
@@ -775,50 +720,6 @@
 				'sambahomedirectory'		=> $user_info['homedirectory'],
 				'defaultLogonScript'		=> $this->current_config['expressoAdmin_defaultLogonScript'],
-				'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false',
-
-				'login_field_empty'     		=> lang('Login field is empty'),
-				'password_field_empty'  		=> lang('Password field is empty'),
-				're-pass_field_empty'  			=> lang('Re-password field is empty'),
-				'pass_re-pass_diferents'       		=> lang('Password and Re-password are differentes'),
-				'register_field_contains_not_allowed'   => lang('Field register contains invalid characters. Only numbers are allowed'),
-				'cpf_field_not_allowed' 		=> lang('Field CPF contains invalid characters. Only numbers are allowed'),
-				'email_field_empty'     		=> lang('Email field is empty'),
-				'first_name_empty'      		=> lang('First name field is empty'),
-				'first_name_not_valid'      		=> lang('First name field is invalid'),
-				'last_name_empty'       		=> lang('Last name field is empty'),
-				'last_name_not_valid'       		=> lang('Last name field is not valid'),
-				'telephone_empty'       		=> lang('Telephone field is empty'),
-				'redirect_email_empty'  		=> lang('Redirect email field is empty'),
-				'without_quota' 			=> lang('User without quota'),
-				'no_group_selected'     		=> lang('No groups selected'),
-				'user_logon_script_empty'      		=> lang('User logon script is empty'),
-				'user_home_path_empty'  		=> lang('User home path is empty'),
-				'user_successfully_created'    		=> lang('User successfully created!'),
-				'user_successfully_saved'      		=> lang('User successfully saved!'),
-				'default_password_registered'  	 	=> lang('Default password successfully registered'),
-				'user_password_returned_with_success'   => lang('User password returned with success'),
-				'user_deleted_with_success'     	=> lang('User deleted successfully!'),
-				'login_field_contains_not_allowed'      => lang('Login field contains invalid characters'),
-				'page_not_found'        		=> lang('Page Not Found!'),
-				'type_name_new_manager' 		=> lang('Type in the new managers name'),
-				'email_field_not_valid' 		=> lang('E-mail field is invalid'),
-				'searching'     			=> lang('Searching...'),
-				'delete_the_list'       		=> lang('Delete list '),
-				'delete_the_group'      		=> lang('Delete group '),
-				'cpf_invalid_field' 			=> lang('Invalid CPF field'),
-				'incorrect_telephone_field'     	=> lang('Incorrect Telephone Field'),
-				'change_user_login'     		=> lang('Change user login'),
-				'to'    				=> lang('to'),
-				'user_renamed_success'  		=> lang('User renamed with success!'),
-				'removed'       			=> lang('removed'),
-				'mb_from_the_user_mailbox'     		=> lang('mb_from_the_user_mailbox'),
-				'cleaning_users_inbox'  		=> lang('Cleaning users inbox'),
-				'lang_insert_password_default'  	=> lang('Insert default password'),
-                                'lang_restore_user_password'   		=> lang('Restore user password'),
-                                'lang_access_records' 			=> lang('Show access records'),
-                                'lang_search_group' 			=> lang('Search group'),
-                                'lang_search_list' 			=> lang('Search list')
+				'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false'
 			);
-
 			$t->set_var($var);
 			
@@ -968,10 +869,10 @@
 			$var = Array(
 				'th_bg'			=> $GLOBALS['phpgw_info']['theme']['th_bg'],
-				'lang_back'	=> lang('Back'),
+				'lang_back'		=> 'Back',
 				'back_url'		=> "./index.php?menuaction=expressoAdmin1_2.uiaccounts.edit_user&account_id=$account_id",
-				'lang_loginid'	=> lang('Login'),
+				'lang_loginid'	=> lang('Login ID'),
 				'lang_ip'		=> lang('IP'),
-				'lang_login'	=> lang('Log in'),
-				'lang_logout'	=> lang('Log out')
+				'lang_login'	=> lang('Log IN'),
+				'lang_logout'	=> lang('Log OUT')
 			);
 			$t->set_var($var);
Index: /trunk/expressoAdmin1_2/inc/class.user.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.user.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.user.inc.php	(revision 309)
@@ -488,17 +488,17 @@
 					else
 					{
-					if ($new_values['photo_exist'])
-					{
-						$photo_exist = true;
-						$this->db_functions->write_log("substituido jpegphoto do usuario",'',$dn,'','');
-					}
-					else
-					{
-						$photo_exist = false;
-						$this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'','');
-					}
-					$this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist);
+						if ($new_values['photo_exist'])
+						{
+							$photo_exist = true;
+							$this->db_functions->write_log("substituido jpegphoto do usuario",'',$dn,'','');
+						}
+						else
+						{
+							$photo_exist = false;
+							$this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'','');
+						}				
+						$this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist);
+					}
 				}	
-			}
 			}
 			
Index: /trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php	(revision 233)
+++ /trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php	(revision 309)
@@ -12,8 +12,4 @@
 	var $imap_server;
 	var $imap_port;
-    var $imap_trashfolder;
-    var $imap_sentfolder;
-    var $imap_draftsfolder;
-    var $imap_spamfolder;
 	
 	function imap_functions(){
@@ -22,11 +18,5 @@
 		$this->imap_server	= $_SESSION['phpgw_info']['expresso']['email_server']['imapServer'];
 		$this->imap_port	= $_SESSION['phpgw_info']['expresso']['email_server']['imapPort'];
-		$this->imap_trashfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'];
-		$this->imap_sentfolder  = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'];
-		$this->imap_draftsfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultDraftsFolder'];
-		$this->imap_spamfolder   = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSpamFolder'];
-
 		$this->imapDelimiter= $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'];
-		
 		$this->imap 		= imap_open('{'.$this->imap_server.':'.$this->imap_port.'/novalidate-cert}', $this->imap_admin, $this->imap_passwd, OP_HALFOPEN);
 		$this->functions	= new functions;
@@ -42,35 +32,25 @@
 			return $result;
 		}
-		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_sentfolder))
+		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Enviados"))
 		{
 			$error = imap_errors();
 			$result['status'] = false;
-			$result['msg'] = "Erro na funcao imap_function->create($this->imap_sentfolder): " . $error[0];
+			$result['msg'] = 'Erro na funcao imap_function->create(Enviados): ' . $error[0];
 			return $result;
 		}
-		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_draftsfolder))
+		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Rascunhos"))
 		{
 			$error = imap_errors();
 			$result['status'] = false;
-			$result['msg'] = "Erro na funcao imap_function->create($this->imap_draftsfolder): " . $error[0];
+			$result['msg'] = 'Erro na funcao imap_function->create(Rascunho): ' . $error[0];
 			return $result;
 		}
-		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_trashfolder))
+		if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Lixeira"))
 		{
 			$error = imap_errors();
 			$result['status'] = false;
-			$result['msg'] = "Erro na funcao imap_function->create($this->imap_trashfolder): " . $error[0];
+			$result['msg'] = 'Erro na funcao imap_function->create(Lixeira): ' . $error[0];
 			return $result;
 		}
-		if ($this->imap_spamfolder != "")
-		    if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_spamfolder))
-			{
-			    $error = imap_errors();
-			    $result['status'] = false;
-			    $result['msg'] = "Erro na funcao imap_function->create($this->imap_spamfolder): " . $error[0];
-			    return $result;
-			}
-
-
 		if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024))) 
 		{
Index: /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php	(revision 309)
@@ -89,15 +89,15 @@
 				'th_bg'						=> $GLOBALS['phpgw_info']['theme']['th_bg'],
 				'add_action'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.add_computer'),
-				'add_computers_disabled'=> $this->functions->check_acl($manager_lid,'create_computers') ? '' : 'display:none',
+				'add_computers_disabled'	=> $this->functions->check_acl($manager_lid,'create_computers') ? '' : 'display:none',
 				'back_url'					=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
 				'lang_back'					=> lang('Back'),
 				'context_display'			=> $context_display,
 				'lang_computers_uid'		=> lang('Computer UID'),
-				'lang_add_computers'	=> lang('Create computer'),
+				'lang_add_computers'		=> lang('Create Computers'),
 				'lang_description'			=> lang('Description'),
 				'lang_edit'  				=> lang('Edit'),
 				'lang_delete'				=> lang('Delete'),
-				'lang_context'		=> lang('Context'),
-				'lang_search'		=> lang('Search')
+				'lang_context'				=> lang('context'),
+				'lang_search'				=> lang('search')
 			);
 			$p->set_var($var);
@@ -177,5 +177,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create computer');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Computers');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -224,17 +224,18 @@
 				'row_off'						=> "#EEEEEE",
 				'color_bg1'						=> "#E8F0F0",
-
 				'lang_back'						=> lang('Back'),
-				'lang_save'			=> lang('Save'),
-				'lang_search_organization'	=> lang('Search organization'),
+				'lang_save'						=> lang('save'),
+				'lang_search_organization'		=> lang('Search Organiztion'),
 				'lang_organizations'			=> lang('Organizations'),
 				'lang_sectors'					=> lang('Sectors'),
 				'lang_sambadomain'				=> lang('Domain'),
+				
 				'lang_computer_cn'				=> lang('Computer UID'),
 				'lang_computer_description'		=> lang('Description'),
-				'lang_computer_type'		=> lang('Computer type'),
-				'lang_active_workstation'	=> lang('Enabled workstation'),
-				'lang_desactive_workstation'	=> lang('Disabled worksation'),
-				'lang_trust_account'		=> lang('Trust account'),
+				'lang_computer_type'			=> lang('Computer Type'),
+				
+				'lang_active_workstation'		=> lang('WorkStation Active'),
+				'lang_desactive_workstation'	=> lang('WorkStation Desactive'),
+				'lang_trust_account'			=> lang('Trust Account'),
 				'lang_server'					=> lang('Server'),
 				'lang_computer_password'		=> lang('Computer password'),
@@ -322,5 +323,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit computer');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Computer');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -370,6 +371,6 @@
 					'color_bg1'						=> "#E8F0F0",
 					'lang_back'						=> lang('Back'),
-					'lang_save'					=> lang('Save'),
-					'lang_search_organization'			=> lang('Search organization'),
+					'lang_save'						=> lang('save'),
+					'lang_search_organization'		=> lang('Search Organiztion'),
 					'lang_organizations'			=> lang('Organizations'),
 					'lang_sectors'					=> lang('Sectors'),
@@ -377,8 +378,8 @@
 					'lang_computer_cn'				=> lang('Computer UID'),
 					'lang_computer_description'		=> lang('Description'),
-					'lang_computer_type'				=> lang('Computer type'),
-					'lang_active_workstation'			=> lang('Enabled workstation'),
-					'lang_desactive_workstation'			=> lang('Disabled worksation'),
-					'lang_trust_account'				=> lang('Trust account'),
+					'lang_computer_type'			=> lang('Computer Type'),
+					'lang_active_workstation'		=> lang('WorkStation Active'),
+					'lang_desactive_workstation'	=> lang('WorkStation Desactive'),
+					'lang_trust_account'			=> lang('Trust Account'),
 					'lang_server'					=> lang('Server'),
 					'lang_computer_password'		=> lang('Computer password'),
@@ -450,13 +451,13 @@
 					'color_bg1'						=> "#E8F0F0",
 					'lang_back'						=> lang('Back'),
-					'lang_save'				=> lang('Save'),
+					'lang_save'						=> lang('save'),
 					'lang_sectors'					=> lang('Sectors'),
 					'lang_sambadomain'				=> lang('Domain'),
 					'lang_computer_cn'				=> lang('Computer UID'),
 					'lang_computer_description'		=> lang('Description'),
-					'lang_computer_type'			=> lang('Computer type'),
-					'lang_active_workstation'		=> lang('Enabled workstation'),
-					'lang_desactive_workstation'		=> lang('Disabled worksation'),
-					'lang_trust_account'			=> lang('Trust account'),
+					'lang_computer_type'			=> lang('Computer Type'),
+					'lang_active_workstation'		=> lang('WorkStation Active'),
+					'lang_desactive_workstation'	=> lang('WorkStation Desactive'),
+					'lang_trust_account'			=> lang('Trust Account'),
 					'lang_server'					=> lang('Server'),
 					'lang_computer_password'		=> lang('Computer password'),
@@ -535,5 +536,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete computer');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete Computer');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -551,5 +552,5 @@
 				'lang_back'					=> lang('Back'),
 				'lang_delete'				=> lang('Delete'),
-				'lang_delete_computer'	=> lang('Do you realy want to delete this computer?'),
+				'lang_delete_computer'		=> lang('Do you realy want delete this Computer?'),
 				'dn'						=> $email_list_data['dn'],
 				'computer_cn'				=> $computer_data['computer_cn'],
Index: /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php	(revision 309)
@@ -69,9 +69,9 @@
 				'back_url'				=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
 				'context_display'		=> $context_display,
-				'lang_context'			=> lang('Context'),
-				'header_name'			=> lang('Sector name'),
-				'lang_add_sub_sectors'		=> lang('Create sub-sectors'),
+				'lang_context'			=> lang('context'),
+				'header_name'			=> lang('SECTORS'),
+				'lang_add_sub_sectors'	=> lang('Add Sub-Sectors'),
 				'header_edit'			=> lang('Edit'),
-				'lang_back'			=> lang('Back'),
+				'lang_back'				=> lang('back'),
 				'header_delete'			=> lang('Delete')
 			);
@@ -134,5 +134,5 @@
 			if (! $GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
 			{
-				$p->set_var('input_add','<input type="submit" value="' . lang('Create sector') . '">');
+				$p->set_var('input_add','<input type="submit" value="' . lang('Add Sectors') . '">');
 			}
 			
@@ -160,5 +160,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create sector');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Sector');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -174,5 +174,5 @@
 				'context'			=> $context == '' ? $GLOBALS['phpgw_info']['server']['ldap_context'] : $context,
 				'sector'			=> $_POST['sector'],
-				'sector_visible_checked'	=> $_POST['sector_visible'] ? 'checked' : '',
+				'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
 				
 				'lang_add'			=> lang('Add'),
@@ -181,5 +181,5 @@
 				'lang_context'		=> lang('Context'),
 				'lang_sector_name'	=> lang('Sector name'),
-				'lang_occult_ou'		=> lang('Hidden sector'),
+				'lang_occult_ou'	=> lang('Occult Sector'),
 				'error_messages'	=> $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>",
 			);
@@ -209,5 +209,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit sector');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sector');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -229,5 +229,5 @@
 				'context'			=> $context == '' ? $manager_context : $context,
 				'sector'				=> $_POST['sector'] == '' ? $sector_name : $_POST['sector'],
-				'sector_visible_checked'	=> $_POST['sector_visible'] ? 'checked' : '',
+				'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
 				
 				'lang_add'			=> lang('Add'),
@@ -237,5 +237,5 @@
 				'lang_context'		=> lang('Context'),
 				'lang_sector_name'	=> lang('Sector name'),
-				'lang_occult_ou'		=> lang('Hidden sector'),
+				'lang_occult_ou'	=> lang('Occult Sector'),
 				'error_messages'	=> $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>",
 			);
@@ -255,5 +255,5 @@
 			if ($sector_name == '')
 			{
-				$_POST['error_messages'] = lang('Sector name is empty');
+				$_POST['error_messages'] = lang('Sector name is empty.');
 				ExecMethod('expressoAdmin1_2.uisectors.add_sector');
 				return;
@@ -287,5 +287,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete sector');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete Sectors');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -333,9 +333,9 @@
 				'lang_back'					=> lang('Back'),
 				'lang_delete'				=> lang('Delete'),
-				'lang_delete_sector'		=> lang('Do you realy want to delete this sector?'),
-				'lang_content_the_users'	=> lang('Users'),
-				'lang_content_the_groups'	=> lang('Groups'),
-				'lang_content_the_sectors'	=> lang('Sub-sectors'),
-				'lang_obs'			=> lang('All users, groups and sub-sectors of this sector will be deleted!'),
+				'lang_delete_sector'		=> lang('Do you realy want delete this sector?'),
+				'lang_content_the_users'	=> lang('Content the folling users'),
+				'lang_content_the_groups'	=> lang('Content the folling groups'),
+				'lang_content_the_sectors'	=> lang('Content the folling sectors'),
+				'lang_obs'					=> lang('All users, groups and sub-sectors of this sector will be DELETED!'),
 				
 				'manager_context'			=> $manager_context,
Index: /trunk/expressoAdmin1_2/inc/class.uidomains.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uidomains.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uidomains.inc.php	(revision 309)
@@ -49,5 +49,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Samba domains');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Samba Domains');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -59,4 +59,16 @@
 			
 			$sambadomains_info = $this->db->get_sambadomains_list();
+			//_debug_array($sambadomains_info);
+			
+			$var = Array(
+				'th_bg'					=> $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'back_url'				=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
+				'lang_sambadomainsname'	=> lang('Samba domains name'),
+				'lang_sambaSID'			=> lang('sambaSID'),
+				'lang_add'				=> lang('Add'),
+				'lang_delete'			=> lang('Delete'),				
+				'lang_back'				=> lang('back')
+			);
+			$p->set_var($var);
 
 			if (!count($sambadomains_info))
@@ -82,12 +94,6 @@
 			
 			$var = Array(
-				'th_bg'				=> $GLOBALS['phpgw_info']['theme']['th_bg'],
-				'back_url'			=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
-				'lang_sambadomainsname'		=> lang('Samba domain name'),
-				'lang_sambaSID'			=> lang('Samba domain SID'),
-				'lang_delete'			=> lang('Delete'),				
-				'lang_back'			=> lang('Back'),
 				'action'	=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uidomains.add'),
-				'input_add' 			=> '<input type="submit" value="' . lang('Create Samba domain') . '">'
+				'input_add' => '<input type="submit" value="' . lang('Add Samba Domains') . '">'
 			);
 			$p->set_var($var);
@@ -116,5 +122,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Samba domain');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Add Samba Domain');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -134,4 +140,5 @@
 				'lang_name'				=> lang('Samba domain name'),
 				'lang_sid'				=> lang('Samba domain SID'),
+				'lang_add'				=> lang('Add'),
 				'lang_save'				=> lang('Save'),
 				'lang_back'				=> lang('Back'),
@@ -152,5 +159,5 @@
 			if ($_POST['sambadomainname'] == '')
 			{
-				$_POST['error_messages'] = lang('Samba domain name is empty') . '.';
+				$_POST['error_messages'] = lang('Samba domains name is empty') . '.';
 				ExecMethod('expressoAdmin1_2.uidomains.add');
 				return;
@@ -159,5 +166,5 @@
 			if ($_POST['sambasid'] == '')
 			{
-				$_POST['error_messages'] = lang('Samba domain SID is empty') . '.';
+				$_POST['error_messages'] = lang('Samba SID is empty') . '.';
 				ExecMethod('expressoAdmin1_2.uidomains.add');
 				return;
@@ -167,5 +174,5 @@
 			if ($this->db->exist_domain_name_sid($_POST['sambadomainname'], $_POST['sambasid']))
 			{
-				$_POST['error_messages'] = lang('Samba domain name or SID already exists') . '.';
+				$_POST['error_messages'] = lang('Samba domain name or SID already exist') . '.';
 				ExecMethod('expressoAdmin1_2.uidomains.add');
 				return;
Index: /trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php	(revision 309)
@@ -58,5 +58,5 @@
 			// Imprime o NavBar
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Managers');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('List Managers');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -115,5 +115,5 @@
 					$p->set_var('link_edit',$this->row_action('edit','edit_managers',$array_managers[manager_lid],$array_managers[context]));
 					$p->set_var('link_delete',$this->row_action('delete','delete_managers',$array_managers[manager_lid],$array_managers[context]));
-					$p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'>".lang('Copy')."</a>");
+					$p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'>Copiar</a>");
 					$p->fp('rows','row',True);
 				}
@@ -141,5 +141,5 @@
 			// Imprime o NavBar
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create manager');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Add Managers');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -180,5 +180,4 @@
 				'context'				=> $_POST['context'],
 				'app_list'				=> $applications_list,
-				'manager_created'		=> lang('Manager successfully created!'),
 				'options_contexts'		=> $options_context
 			);
@@ -280,5 +279,5 @@
 			// Imprime o NavBar
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Manager');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Managers');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -305,12 +304,13 @@
 				'type'						=> "edit",
 				'display_manager_select' 	=> 'none',
-				'input_manager_lid_disabled'	=> 'disabled',
+				'input_manager_lid_disabled'=> 'disabled',
 				'error_messages'			=> $_POST['error_messages'] == '' ? '' : '<script language="JavaScript1.3">alert("'.$_POST['error_messages'].'");</script>',
 				'manager_lid'				=> $_POST['manager_lid'],
 				'hidden_manager_lid'		=> $_POST['manager_lid'],
 				'context'					=> $_POST['context'],
-				'manager_salved'		=> lang('Manager successfully salved!'),
+				
 				'input_context_fields'		=> $input_context_fields,
 				'options_contexts'			=> $options_context,
+				
 				'hidden_manager_lid'		=> $hidden_manager_lid,
 				'app_list'					=> $applications_list
@@ -340,5 +340,5 @@
 			echo $p->fp('out','form');
 		}
-		
+				
 		function make_lang($ram_lang)
 		{
Index: /trunk/expressoAdmin1_2/inc/access_denied.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/access_denied.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/access_denied.php	(revision 309)
@@ -20,5 +20,5 @@
 	
 	$var = Array(
-		'lang_access_denied' 	=> lang('You don\'t have access to this module.'),
+		'lang_access_denied' => lang('You dont have access to this module.'),
 		'lang_back'	=> lang('Back'),
 		'back_url'	=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php')
Index: /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php	(revision 309)
@@ -70,5 +70,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
 			
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('E-mail lists');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Email Lists');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -81,23 +81,20 @@
 			// Seta as variaveis padroes.
 			$var = Array(
-				'add_action'		=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.add_maillists'),
 				'th_bg'						=> $GLOBALS['phpgw_info']['theme']['th_bg'],
 				'back_url'					=> $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),
+				'add_action'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.add_maillists'),
 				'add_email_lists_disabled'	=> $this->functions->check_acl($manager_lid,'add_maillists') ? '' : 'disabled',
 				'context_display'			=> $context_display,
-
-				'lang_email_lists_uid'		=> lang('E-mail list names'),
-				'lang_email_lists_names'	=> lang('E-mail list descriptions'),
-				'lang_add_email_lists'		=> lang('Create e-mail list'),
+				'lang_email_lists_uid'		=> lang('Email Lists Logins'),
+				'lang_email_lists_names'	=> lang('Email Lists Names'),
+				'lang_add_email_lists'		=> lang('Add Email Lists'),
 				'lang_edit'  				=> lang('Edit'),
-				'lang_scl'  			=> lang('SCL'),
-				'lang_delete'			=> lang('Delete'),
+				'lang_scl'  				=> 'SCL',
+				'lang_delete'				=> 'Excluir',
 				'lang_view'					=> lang('View'),
-				'lang_back'			=> lang('Back'),
-				'lang_context'			=> lang('Context'),
+				'lang_back'					=> lang('back'),
+				'lang_context'				=> lang('context'),
 				'lang_email'				=> lang('E-mail'),
-				'lang_delete_list'		=> lang('Delete e-mail list?'),
-				'lang_delete_list_success'	=> lang('E-mail list successfully deleted!'),
-				'lang_search'			=> lang('Search')
+				'lang_search'				=> lang('search')
 			);
 			$p->set_var($var);
@@ -111,10 +108,11 @@
 				$maillists_info = $this->functions->get_list('maillists', $GLOBALS['query'], $manager_contexts);
 			}
-
-			if (!count($maillists_info) && $GLOBALS['query'] != '')
+			$total = count($maillists_info);
+
+			if (!count($total) && $GLOBALS['query'] != '')
 			{
 				$p->set_var('message',lang('No matches found'));
 			}
-			else if (count($maillists_info))
+			else if ($total)
 			{
 				if ($this->functions->check_acl($manager_lid,'edit_maillists'))
@@ -152,5 +150,5 @@
 					}
 
-					if ($can_edit_scl) 
+					if ( ($can_edit_scl) && ($this->current_config['expressoAdmin_scl']) )
 					{
 						$p->set_var('scl_link',$this->row_action('scl','maillists',$maillist['uidnumber'],$maillist['uid']));
@@ -163,5 +161,5 @@
 					if ($can_delete)
 					{
-						$p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'>".lang('Delete')."</a>");
+						$p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'>Excluir</a>");
 					}
 					else
@@ -192,5 +190,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create e-mail list');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Email List');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			
@@ -206,41 +204,29 @@
 			// Seta variaveis utilizadas pelo tpl.
 			$var = Array(
-				'back_url'		=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),
 				'color_bg1'					=> "#E8F0F0",
 				'color_bg2'					=> "#D3DCE3",
 				'type'						=> 'create_maillist',
 				'ldap_context'				=> $GLOBALS['phpgw_info']['server']['ldap_context'],
+				'uid'						=> 'lista-',
 				'accountStatus_checked'		=> 'CHECKED',
 				'restrictionsOnEmailLists'	=> $this->current_config['expressoAdmin_restrictionsOnEmailLists'],
-				'combo_manager_org'                     	=> $combo_manager_org,
-				'combo_all_orgs'                        	=> $combo_all_orgs,
-				'defaultDomain'                         	=> $this->current_config['expressoAdmin_defaultDomain'],
-				'combo_org'					=> $sectors,
 				'lang_back'					=> lang('Back'),
-				'lang_save'					=> lang('Save'),
-				'lang_maillist_organization'			=> lang('E-mail list organization'),
-				'lang_search_organization'			=> lang('Search organization'),
+				'lang_save'					=> lang('save'),
+				'lang_maillist_organization'=> lang('Maillist Organization'),
+				'lang_search_organization'	=> lang('Search Organiztion'),
 				'lang_search_user'			=> lang('Search user'),
-				'lang_users'					=> lang('Users'),
 				'lang_organizations'		=> lang('Organizations'),
-				'lang_maillist_uid'				=> lang('E-mail list login'),
-				'lang_maillist_mail'				=> lang('E-mail list address'),
-				'lang_maillist_name'				=> lang('E-mail list name'),
-				'lang_maillist_users'				=> lang('E-mail list users'),
+				'lang_maillist_uid'			=> lang('Maillist login'),
+				'lang_maillist_mail'		=> lang('Maillist Mail'),
+				'lang_maillist_name'		=> lang('Maillist name'),
+				'lang_maillist_users'		=> lang('Maillist users'),
 				'lang_add_user'				=> lang('Add User'),
 				'lang_rem_user'				=> lang('Remove User'),
 				'lang_all_users'			=> lang('Show users from all sub-organizations'),
-				'login_field_has_spaces'        => lang('Login field has spaces'),
-				'list_email_field_is_empty'     		=> lang('E-mail list address field is empty'),
-				'lang_list_name_field_is_empty' 	  	=> lang('E-mail list name is empty'),
-				'no_user_is_part_of_the_list'   		=> lang('No user is member of the list!'),
-				'email_list_successfully_created'       	=> lang('E-mail list successfully created!'),
-				'field_email_is_invalid'   			=> lang('E-mail list address is invalid'),
-				'lang_email_list_empty' 			=> lang('The e-mail list is empty'),
-				'lang_hide_email_list' 				=> lang('Hide e-mail list'),
-				'it_is_not_possible_select_users' 		=> lang('It is impossible to create an e-mail list with all organization users'),
-				'login_field_incomplete'   			=> lang("The lists' name field  is incomplete. The lists' name must be in the following format: lista-organization-name. Ex: lista-celepar-rh")
+				'back_url'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),
+				'combo_manager_org'			=> $combo_manager_org,
+				'combo_all_orgs'			=> $combo_all_orgs,
+				'defaultDomain'				=> $this->current_config['expressoAdmin_defaultDomain']
 			);
-
 			$p->set_var($var);
 			
@@ -267,5 +253,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit e-mail list');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Email Lists');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -309,13 +295,13 @@
 				if ($mail_not_found != '')
 				{
-					$opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('E-mails not found').'&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
+					$opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;E-mails não encontrados&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
 					$ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found;
 				}
 				if ($lists != '')
 				{
-					$opt_tmp_lists  = '<option  value="-1" disabled>------------------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('Lists').'&nbsp;&nbsp;&nbsp;&nbsp;------------------------------ </option>'."\n";
+					$opt_tmp_lists  = '<option  value="-1" disabled>------------------------------&nbsp;&nbsp;&nbsp;&nbsp;Listas&nbsp;&nbsp;&nbsp;&nbsp;------------------------------ </option>'."\n";
 					$ea_select_usersInMaillist .= $opt_tmp_lists . $lists;
 				}
-				$opt_tmp_users  = '<option  value="-1" disabled>-----------------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('Users').'&nbsp;&nbsp;&nbsp;&nbsp;---------------------------- </option>'."\n";
+				$opt_tmp_users  = '<option  value="-1" disabled>-----------------------------&nbsp;&nbsp;&nbsp;&nbsp;Usuários&nbsp;&nbsp;&nbsp;&nbsp;---------------------------- </option>'."\n";
 				$ea_select_usersInMaillist .= $opt_tmp_users . $users;
 			}
@@ -323,9 +309,22 @@
 			// Seta variaveis utilizadas pelo tpl.
 			$var = Array(
-				'back_url'		=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),
 				'color_bg1'						=> "#E8F0F0",
 				'color_bg2'						=> "#D3DCE3",
 				'type'							=> 'edit_maillist',
 				'ldap_context'					=> $GLOBALS['phpgw_info']['server']['ldap_context'],
+				'lang_back'						=> lang('Back'),
+				'lang_save'						=> lang('save'),
+				'lang_maillist_organization'	=> lang('Maillist Organization'),
+				'lang_search_organization'		=> lang('Search Organiztion'),
+				'lang_search_user'				=> lang('Search user'),
+				'lang_organizations'			=> lang('Organizations'),
+				'lang_maillist_uid'				=> lang('Maillist login'),
+				'lang_maillist_mail'			=> lang('Maillist Mail'),
+				'lang_maillist_name'			=> lang('Maillist name'),
+				'lang_maillist_users'			=> lang('Maillist users'),
+				'lang_add_user'					=> lang('Add User'),
+				'lang_rem_user'					=> lang('Remove User'),
+				'lang_all_users'				=> lang('Select users from all sub-organizations'),
+				'back_url'						=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),
 				'combo_manager_org'				=> $combo_manager_org,
 				'combo_all_orgs'				=> $combo_all_orgs,
@@ -338,24 +337,5 @@
 				'phpgwAccountVisible_checked'	=> $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '',
 				'ea_select_usersInMaillist'		=> $ea_select_usersInMaillist,
-				'defaultDomain'			=> $this->current_config['expressoAdmin_defaultDomain'],
-				'restrictionsOnEmailLists'      => $this->current_config['expressoAdmin_restrictionsOnEmailLists'],	
-				'lang_back'			=> lang('Back'),
-				'lang_save'			=> lang('Save'),
-				'lang_maillist_organization'	=> lang('E-mail list organization'),
-				'lang_search_organization'	=> lang('Search organization'),
-				'lang_search_user'		=> lang('Search user'),
-				'lang_organizations'		=> lang('Organizations'),
-				'lang_maillist_uid'		=> lang('E-mail list login'),
-				'lang_maillist_mail'		=> lang('E-mail list address'),
-				'lang_maillist_name'		=> lang('E-mail list name'),
-				'lang_maillist_users'		=> lang('E-mail list users'),
-				'lang_users'                    => lang('Users'),
-				'lang_add_user'			=> lang('Add User'),
-				'lang_rem_user'			=> lang('Remove User'),
-                                'lang_email_list_empty'         => lang('The e-mail list is empty'),
-                                'lang_hide_email_list'          => lang('Hide e-mail list'),
-				'email_list_successfully_saved' => lang('E-mail list successfully saved!'),
-				'lang_all_users'		=> lang('Show users from all sub-organizations'),
-				'login_field_incomplete'        => lang("The lists' name field  is incomplete. The lists' name must be in the following format: lista-organization-name. Ex: lista-celepar-rh")				
+				'defaultDomain'					=> $this->current_config['expressoAdmin_defaultDomain']
 			);
 			$p->set_var($var);
@@ -383,5 +363,5 @@
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
 			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit sending control list');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sending Control List');
 			$GLOBALS['phpgw']->common->phpgw_header();
 
@@ -416,4 +396,14 @@
 				'ldap_context'					=> $GLOBALS['phpgw_info']['server']['ldap_context'],
 				'dn'							=> $maillist_info['dn'],
+				'lang_back'						=> lang('Back'),
+				'lang_save'						=> lang('save'),
+				'lang_org'						=> lang('Organizations'),
+				'lang_maillist_uid'				=> lang('Maillist login'),
+				'lang_maillist_mail'			=> lang('Maillist Mail'),
+				'lang_maillist_name'			=> lang('Maillist name'),
+				'lang_maillist_users'			=> lang('Maillist users'),
+				'lang_add_user'					=> lang('Add User'),
+				'lang_rem_user'					=> lang('Remove User'),
+				'lang_all_users'				=> lang('Show users from all sub-organizations'),
 				'back_url'						=> $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),
 				'combo_org'						=> $sectors,
@@ -423,24 +413,6 @@
 				'cn'							=> $maillist_info['cn'],
 				'accountRestrictive_checked'	=> $maillist_info['accountRestrictive'] == 'mailListRestriction' ? 'CHECKED' : '',
-				'participantCanSendMail_checked'		=> $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '',
-				'ea_select_users_SCL_Maillist'			=> $ea_select_users_SCL_Maillist,
-				'lang_back'					=> lang('Back'),
-				'lang_save'					=> lang('Save'),
-				'lang_org'					=> lang('Organizations'),
-				'lang_maillist_uid'				=> lang('E-mail list login'),
-				'lang_maillist_mail'				=> lang('E-mail list address'),
-				'lang_maillist_name'				=> lang('E-mail list name'),
-				'lang_maillist_users'				=> lang('E-mail list users'),
-				'lang_add_user'					=> lang('Add user'),
-				'lang_rem_user'					=> lang('Remove user'),
-				'lang_apply_scl'				=> lang('Apply send control to this list?'),
-				'lang_list_email'				=> lang('List e-mail'),
-				'lang_members_send'				=> lang('List members can send e-mail?'),
-				'lang_allowed_send_email'			=> lang('Users allowed to send e-mail to the list'),
-				'lang_organization'				=> lang('Organizations'),
-				'lang_search_user'				=> lang('Search user'),
-				'lang_users'					=> lang('Users'),
-				'sending_control_list_successfully_saved'       => lang('Sending control list sucessfully saved!'),
-				'lang_all_users'				=> lang('Show users from all sub-organizations')
+				'participantCanSendMail_checked'=> $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '',
+				'ea_select_users_SCL_Maillist'	=> $ea_select_users_SCL_Maillist
 			);
 			$p->set_var($var);
Index: /trunk/expressoAdmin1_2/inc/class.uilogs.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uilogs.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.uilogs.inc.php	(revision 309)
@@ -113,11 +113,11 @@
 				'query_other'		=> $_POST['query_other'],
 				
-				'lang_manager_lid'	=> lang('Login'),
+				'lang_manager_lid'	=> lang('Manager Login'),
 				'lang_date'			=> lang('Date'),
 				'lang_hour'			=> lang('Hour'),
 				'lang_action'		=> lang('Action'),
-				'lang_view'		=> lang('View'),
-				'lang_back'		=> lang('Back'),
-				'lang_search'		=> lang('Search'),
+				'lang_view'			=> lang('view'),
+				'lang_back'			=> lang('back'),
+				'lang_search'		=> lang('search'),
 				'lang_action'		=> lang('Action'),
 				'lang_other'		=> lang('Other')
@@ -137,17 +137,12 @@
 					$this->nextmatchs->template_alternate_row_color($p);
 
-					$tmp = explode(" ", $log['date']);
-					$tmp_date = explode("-", $tmp[0]);
-					$date = $tmp_date[2] . '/' . $tmp_date[1] . '/' . $tmp_date[0];
-					$tmp_hour = explode(".", $tmp[1]);
-					$hour = $tmp_hour[0];
-
 					$var = array(
 						'row_manager_lid'	=> $log['manager'],
 						'row_action'		=> $log['action'],
-						'row_date' 		=> $date." ".$hour,
-						'row_view'  		=> $this->row_action('view','log',$log['date'])
+						'row_date' 			=> $log['date'],
+						//'row_view'  => (!$account['account_lastname']?'&nbsp':$account['account_lastname'])
 					);
 					$p->set_var($var);
+					$p->set_var('row_view',$this->row_action('view','log',$log['date']));
 					$p->parse('rows','row',True);
 				}
@@ -210,11 +205,11 @@
 				
 				'lang_back'			=> lang('Back'),
-				'lang_manager_lid'	=> lang('Login'),
+				'lang_manager_lid'	=> lang('Manager Login'),
 				'lang_date'			=> lang('Date'),
 				'lang_hour'			=> lang('Hour'),
 				'lang_action'		=> lang('Action'),
-				'lang_userinfo'		=> lang('User information'),
-				'lang_groupinfo'	=> lang('Group information'),
-				'lang_appinfo'		=> lang('Application information')				
+				'lang_userinfo'		=> lang('User Info'),
+				'lang_groupinfo'	=> lang('Group Info'),
+				'lang_appinfo'		=> lang('App Info')				
 			);
 			
Index: /trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php	(revision 283)
+++ /trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php	(revision 309)
@@ -36,5 +36,5 @@
 		function show_total_sessions()
 		{
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Total sessions');
+			$GLOBALS['phpgw_info']['flags']['app_header'] = 'ExpressoAdmin - '.lang('Total Sessions');
 			$GLOBALS['phpgw']->common->phpgw_header();
 			echo parse_navbar();
@@ -45,6 +45,6 @@
 			$total = $this->get_total_sessions();
 			
-			$this->template->set_var('lang_total', lang('Total sessions'));
-			$this->template->set_var('lang_back', lang('Back'));
+			$this->template->set_var('lang_total', lang('totalsessions'));
+			$this->template->set_var('lang_back', lang('back'));
 			$this->template->set_var('back_url', $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'));
 			$this->template->set_var('total', $total);
Index: /trunk/expressoAdmin1_2/js/jscode/tabs.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/tabs.js	(revision 283)
+++ /trunk/expressoAdmin1_2/js/jscode/tabs.js	(revision 309)
@@ -83,4 +83,5 @@
         document.getElementById(this.HTMLtabcontentID + tabnr).className = this.activeCSSclass;
 
+	
       if(document.getElementById(this.HTMLtabselectorID))
         document.getElementById(this.HTMLtabselectorID).selectedIndex = tabnr-1;
Index: /trunk/expressoAdmin1_2/js/jscode/managers.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/managers.js	(revision 283)
+++ /trunk/expressoAdmin1_2/js/jscode/managers.js	(revision 309)
@@ -2,5 +2,5 @@
 function copy_manager(manager)
 {
-	var new_manager = prompt(document.getElementById('type_the_new_manager_login').value,"");
+	var new_manager = prompt("Digite o login do novo gerente:","");
 	
 	var handler_copy_manager = function(data)
@@ -9,5 +9,5 @@
 			location.reload();
 		else
-			alert(document.getElementById('error_at_copy_manager').value);
+			alert('Erro ao copiar gerente.');
 	}
 	cExecute ('$this.db_functions.copy_manager&manager='+manager+'&new_manager='+new_manager, handler_copy_manager);
@@ -100,7 +100,7 @@
 	{
 		if (data.type == 'create')
-			alert(document.getElementById('manager_created').value);
+			alert('Gerente criado com êxito');
 		else
-			alert(document.getElementById('manager_salved').value);
+			alert('Gerente salvo com êxito');
 	}
 	location.href="./index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers";
Index: /trunk/expressoAdmin1_2/js/jscode/groups.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/groups.js	(revision 283)
+++ /trunk/expressoAdmin1_2/js/jscode/groups.js	(revision 309)
@@ -7,10 +7,10 @@
 	
 	if (document.forms[0].cn.value == ''){
-		alert(document.getElementById('group_name_field_is_empty').value);
+		alert('Campo NOME do grupo está vazio.');
 		return;
 	}
 		
 	if (document.forms[0].description.value == ''){
-		alert(document.getElementById('description_field_is_empty').value);
+		alert('Campo DESCRIÇÃO está vazio.');
 		return;
 	}
@@ -20,5 +20,9 @@
 		cn_tmp = document.forms[0].cn.value.split("-");
 		if ( (cn_tmp.length < 3) || ((cn_tmp[0] != 'grupo') && (cn_tmp[0] != 'smb')) ){
-		    	alert(document.getElementById('field_name_is_incomplete').value);
+			alert(
+				'O campo NOME do grupo está incompleto.\n' +
+				'O nome do grupo deve ser formado assim:\n' +
+				'grupo-ORGANIZACAO-NOME_DO_GRUPO.\n' +
+				'Ex: grupo-celepar-rh.');
 			return;
 		}
@@ -29,5 +33,5 @@
 	
 	if(!reCn.test(document.forms[0].cn.value)){
-		alert(document.getElementById('group_name_not_allowed').value);
+		alert('Campo NOME DO GRUPO comtém caracteres não permitidos.');
 		document.forms[0].cn.focus();
 		return;
@@ -35,5 +39,5 @@
 
 	if(!reDesc.test(document.forms[0].description.value)){
-		alert(document.getElementGroupById('description_field_not_allowed').value);
+		alert('Campo DESCRIÇÃO comtém caracteres não permitidos.');
 		document.forms[0].description.focus();
 		return;
@@ -41,7 +45,7 @@
 	
 	var reEmail = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-	if ( (document.forms[0].email.value == '') || (!reEmail.test(document.forms[0].email.value)) )
-	{
-		alert(document.getElementById('field_email_is_invalid').value);
+	if ( (document.forms[0].email.value != '') && (!reEmail.test(document.forms[0].email.value)) )
+	{
+		alert("Campo E-mail não é válido.");
 		return false;
 	}
@@ -86,5 +90,5 @@
 		alert(data.msg);
 	else{
-		alert(document.getElementById('group_successfully_created').value);
+		alert('Grupo criado com êxito!');
 		location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups";
 	}
@@ -103,5 +107,5 @@
 		alert(data.msg);
 	else{
-		alert(document.getElementById('group_successfully_saved').value);
+		alert('Grupo salvo com êxito!!');
 		location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups";
 	}
@@ -152,5 +156,5 @@
 	if ((recursive) && (document.forms[0].ldap_context.value == document.getElementById('ea_combo_org_groups').value))
 	{
-		alert(document.getElementById('not_possible_select_all_users').value)
+		alert('Nao é possível selecionar todos os usuários da organização raiz.')
 		document.getElementById('ea_check_allUsers').checked = false;
 
@@ -266,5 +270,5 @@
 function delete_group(cn, gidnumber)
 {
-	if (confirm(document.getElementById('delete_group').value + " (" + cn + ")"))
+	if (confirm("Realmente deletar Grupo " + cn + " ??"))
 	{
 		var handler_delete_group = function(data)
@@ -273,5 +277,5 @@
 				alert(data.msg);
 			else
-				alert(document.getElementById('group_successfully_deleted').value);
+				alert('Grupo deletado com êxito!!');
 			
 			location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups";
Index: /trunk/expressoAdmin1_2/js/jscode/maillists.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/maillists.js	(revision 283)
+++ /trunk/expressoAdmin1_2/js/jscode/maillists.js	(revision 309)
@@ -1,4 +1,4 @@
 countFiles = 0;
-function validate_fields(type, restrictionsOnEmailLists)
+function validate_fields(type)
 {
 	document.forms[0].uid.value = document.forms[0].uid.value.toLowerCase();
@@ -6,18 +6,22 @@
 	
 	if (document.forms[0].uid.value == ''){
-		alert(document.getElementById('login_field_has_spaces').value);
+		alert('Campo LOGIN da lista está vazio.');
 		return;
 	}
 
 	if (document.forms[0].cn.value == ''){
-		alert(document.getElementById('list_name_field_is_empty').value);
-		return;
-	}
-	
-	if (restrictionsOnEmailLists == 'true')
+		alert('Campo NOME da lista está vazio.');
+		return;
+	}
+	
+	if (document.forms[0].restrictionsOnEmailLists.value == 'true')
 	{
 		uid_tmp = document.forms[0].uid.value.split("-");
 		if ((uid_tmp.length < 3) || (uid_tmp[0] != 'lista')){
-			alert(document.getElementById('login_field_incomplete').value);
+			alert(
+				'O campo LOGIN da lista está incompleto.\n' +
+				'O nome da lista deve ser formado assim:\n' +
+				'lista-ORGANIZACAO-NOME_DA_LISTA.\n' +
+				'Ex: lista-celepar-rh.');
 			return;
 		}
@@ -25,5 +29,5 @@
 		
 	if (document.forms[0].uid.value.split(" ").length > 1){
-		alert(document.getElementById('login_field_has_spaces').value);
+		alert('Campo LOGIN comtém espaços.');
 		document.forms[0].uid.focus();
 		return;
@@ -31,5 +35,5 @@
 	
 	if (document.forms[0].mail.value == ''){
-		alert(document.getElementById('list_email_field_is_empty').value);
+		alert('Campo E-MAIL da lista está vazio.');
 		document.forms[0].mail.focus();
 		return;
@@ -37,5 +41,5 @@
 	var reEmail = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 	if(!reEmail.test(document.forms[0].mail.value)){
-		alert(document.getElementById('field_email_is_invalid').value);
+		alert("Campo E-mail não é válido.");
 		return false;
 	}
@@ -43,5 +47,5 @@
 	select_userInMaillist = document.getElementById('ea_select_usersInMaillist');
 	if (select_userInMaillist.options.length == 0){
-		alert(document.getElementById('no_user_is_part_of_the_list').value);
+		alert('Nenhum usuário faz parte da lista.');
 		return;
 	}
@@ -91,5 +95,5 @@
 		alert(data.msg);
 	else{
-		alert(document.getElementById('email_list_successfully_created').value);
+		alert('Lista de emails criada com êxito!');
 		location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists";
 	}
@@ -108,5 +112,5 @@
 		alert(data.msg);
 	else{
-		alert(document.getElementById('email_list_successfully_saved').value);
+		alert('Lista de emails salva com êxito!!');
 		location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists";
 	}
@@ -133,5 +137,5 @@
 		alert(data.msg);
 	else
-		alert(document.getElementById('sending_control_list_successfully_saved').value);
+		alert('Sending Control List salva com êxito!!');
 	location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists";
 	return;
@@ -181,5 +185,5 @@
 	if ((recursive) && (document.forms[0].ldap_context.value == document.getElementById('ea_combo_org_maillists').value))
 	{
-	    alert(document.getElementById('it_is_not_possible_select_users').value);
+		alert('Nao é possível selecionar todos os usuários da organização raiz.')
 		document.getElementById('ea_check_allUsers').checked = false;
 		
@@ -354,5 +358,5 @@
 function delete_maillist(uid, uidnumber)
 {
-	if (confirm(document.getElementById('delete_list').value + " (" +  uid + ")"))
+	if (confirm("Realmente deletar Lista " + uid + " ??"))
 	{
 		var handler_delete_maillist = function(data)
@@ -361,10 +365,10 @@
 				alert(data.msg);
 			else
-				alert(document.getElementById('email_list_successfully_deleted').value);
+				alert('Lista de email deletada com êxito!!');
 			
 			location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists";
 			return;
 		}
-		cExecute('$this.maillist.delete&uidnumber='+uidnumber, handler_delete_maillist); 
+		cExecute ('$this.maillist.delete&uidnumber='+uidnumber, handler_delete_maillist);
 	}
 }
@@ -414,6 +418,2 @@
 	return ufn.substring(0,(ufn.length-1));
 }
-
-function dfg(){
-	alert('aaa');
-}
Index: /trunk/expressoAdmin1_2/js/jscode/users.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/users.js	(revision 283)
+++ /trunk/expressoAdmin1_2/js/jscode/users.js	(revision 309)
@@ -6,10 +6,11 @@
 		//UID
 		document.forms[0].uid.value = document.forms[0].uid.value.toLowerCase();
+		
 		if (document.forms[0].uid.value == ''){
-			alert(document.getElementById('login_field_empty').value);
+			alert('Campo LOGIN está vazio.');
 			return;
 		}
 		else if (document.forms[0].uid.value.length < document.forms[0].minimumSizeLogin.value){
-			alert(document.getElementById('login_field_must_have').value + " " +document.forms[0].minimumSizeLogin.value + " " +document.getElementById('characters').value );
+			alert('Campo LOGIN deve ter mais que '+document.forms[0].minimumSizeLogin.value+' caracteres.');
 			return;
 		}
@@ -21,5 +22,5 @@
 			var reUid = /^([a-zA-Z0-9_\-])+$/;
 		if(!reUid.test(document.forms[0].uid.value)){
-			alert(document.getElementById('login_field_contains_not_allowed').value);
+			alert('Campo LOGIN comtém caracteres não permitidos.');
 			document.forms[0].account_lid.focus();
 			return;
@@ -28,9 +29,9 @@
 		//PASSWORD's
 		if (document.forms[0].password1.value == ''){
-			alert(document.getElementById('password_field_empty').value);
+			alert('Campo SENHA está vazio.');
 			return;
 		}
 		if (document.forms[0].password2.value == ''){
-			alert(document.getElementById('re-password_field_empty').value);
+			alert('Campo RE-SENHA está vazio.');
 			return;
 		}
@@ -38,5 +39,5 @@
 
 	if (document.forms[0].password1.value != document.forms[0].password2.value){
-		alert(document.getElementById('pass_re-pass_diferents').value);
+		alert('Campo SENHA e RE-SENHA são diferentes.');
 		return;
 	}
@@ -49,5 +50,5 @@
 		if(!re_employeenumber.test(document.forms[0].corporative_information_employeenumber.value))
 		{
-			alert(document.getElementById('register_field_contains_not_allowed').value);
+			alert('Campo matrícula contém caracteres não permitidos. Somente números são permitidos.');
 			document.forms[0].corporative_information_employeenumber.focus();
 			return;
@@ -61,5 +62,5 @@
 		if(!re_cpf.test(document.forms[0].corporative_information_cpf.value))
 		{
-			alert(document.getElementById('cpf_field_not_allowed').value);
+			alert('Campo cpf contém caracteres não permitidos. Somente números são permitidos');
 			document.forms[0].corporative_information_employeenumber.focus();
 			return;
@@ -68,5 +69,5 @@
 		if (! validarCPF(document.forms[0].corporative_information_cpf.value) )
 		{
-			alert(document.getElementById('cpf_field_invalid').value);
+			alert("Campo CPF invalido.");
 			document.forms[0].corporative_information_cpf.focus();
 			return;
@@ -77,33 +78,33 @@
 	document.forms[0].mail.value = document.forms[0].mail.value.toLowerCase();
 	if (document.forms[0].mail.value == ''){
-		alert(document.getElementById('email_field_empty').value);
+		alert('Campo E-MAIL está vazio.');
 		return;
 	}
 	var reEmail = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 	if(!reEmail.test(document.forms[0].mail.value)){
-		alert(document.getElementById('email_field_not_valid').value);
+		alert("Campo E-mail não é válido.");
 		return false;
 	}
 	
 	//FIRSTNAME
-	if (document.forms[0].givenname.value == ''){
-		alert(document.getElementById('first_name_empty').value);
-		return;
-	}
-        var reGivenname = /^[a-zA-Z0-9 \-\.]+$/;
-        if(!reGivenname.test(document.forms[0].givenname.value)){
-		alert(document.getElementById('first_name_not_valid').value);
-	        return false;
-	} 
+	var reGivenname = /^[a-zA-Z0-9 \-\.]+$/;
+	if(!reGivenname.test(document.forms[0].givenname.value)){
+		alert('Primeiro Nome contém caracteres inválidos.');
+		return false;
+	}
+	else if (document.forms[0].givenname.value == ''){
+		alert('Campo PRIMEIRO NOME está vazio.');
+		return;
+	}
 	
 	//LASTNAME
-	if (document.forms[0].sn.value == ''){
-		alert(document.getElementById('last_name_empty').value);
-		return;
-	}
 	var reSn = /^[a-zA-Z0-9 \-\.]+$/;
 	if(!reSn.test(document.forms[0].sn.value)){
-	 	alert(document.getElementById('last_name_not_valid').value);
-	        return false;
+		alert('Último Nome contém caracteres inválidos.');
+		return false;
+	}
+	else if (document.forms[0].sn.value == ''){
+		alert('Campo ÚLTIMO NOME está vazio.');
+		return;
 	}
 	
@@ -114,5 +115,5 @@
 		if (!reg_tel.exec(document.forms[0].telephonenumber.value))
 		{
-			alert(document.getElementById('incorrect_telephone_field').value);
+			alert('Campo Telefone incorreto.');
 			return;
 		}
@@ -121,5 +122,5 @@
 	//FORWAR ONLY
 	if ((document.forms[0].deliverymode.checked) && (document.forms[0].mailforwardingaddress.value == '')){
-		alert(document.getElementById('redirect_email_empty').value);
+		alert('Campo E-MAIL DE ENCAMINHAMENTO está vazio.');
 		return;
 	}
@@ -127,5 +128,5 @@
 	// Email Quota
 	if (document.forms[0].mailquota.value == ''){
-		alert(document.getElementById('without_quota').value);
+		alert('Usuário sem COTA.');
 		return;
 	}
@@ -133,5 +134,5 @@
 	//GROUPS
 	if (document.getElementById('ea_select_user_groups').length < 1){
-		alert(document.getElementById('no_group_selected').value);
+		alert('Nenhum GRUPO selecionado.');
 		return;
 	}
@@ -140,9 +141,9 @@
 	if (document.getElementById('tabcontent6').style.display != 'none'){
 		if ((document.forms[0].sambalogonscript.value == '') && (!document.forms[0].sambalogonscript.disabled)){
-			alert(document.getElementById('user_logon_script_empty').value);
+			alert('Script de logon do usuário está vazio.');
 			return;
 		}
 		if ((document.forms[0].sambahomedirectory.value == '') && (!document.forms[0].sambahomedirectory.disabled)){
-			alert(document.getElementById('user_home_path_empty').value);
+			alert('Diretório Home do usuário está vazio.');
 			return;
 		}
@@ -215,5 +216,5 @@
 		alert(data.msg);
 	else
-		alert(document.getElementById('user_successfully_created').value);
+		alert('Usuário criado com êxito!');
 
 	location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users";
@@ -234,5 +235,5 @@
 	}
 	else{
-		alert(document.getElementById('user_successfully_saved').value);
+		alert('Usuário salvo com êxito!!');
 	}
 	location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users";
@@ -457,5 +458,5 @@
 			alert(data.msg);
 		else
-			alert(document.getElementById('default_password_successfully_registered_cadastre').value);
+			alert('Senha default cadastrada com êxito!!');
 		return;
 	}
@@ -470,5 +471,5 @@
 			alert(data.msg);
 		else
-			alert(document.getElementById('user_password_returned_with_success').value);
+			alert('Senha do usuário retornado com êxito!!');
 		return;
 	}
@@ -478,5 +479,5 @@
 function delete_user(uid, uidnumber)
 {
-	if (confirm(document.getElementById('delete_the_user').value + " (" + uid + ")"))
+	if (confirm("Realmente deseja deletar o usuário " + uid + " ??"))
 	{
 		var handler_delete_user = function(data)
@@ -485,5 +486,5 @@
 				alert(data.msg);
 			else
-				alert(document.getElementById('user_deleted_with_success').value);
+				alert('Usuário deletado com êxito!!');
 			
 			location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users";
@@ -501,8 +502,8 @@
 		var reUid = /^([a-zA-Z0-9_\-])+$/;
 
-	new_uid = prompt(document.getElementById('change_user_login').value + " (" + uid + ") "  + document.getElementById('to').value, uid);
+	new_uid = prompt("Alterar login do usuário " + uid + " para: ", uid);
 
 	if(!reUid.test(new_uid)){
-		alert(document.getElementById('login_field_contains_not_allowed').value);
+		alert('Campo LOGIN comtém caracteres não permitidos.');
 		document.forms[0].account_lid.focus();
 		return;
@@ -537,5 +538,5 @@
 		alert(data.msg);
 	else{
-		alert(document.getElementById('user_renamed_success').value + "\n" + data.exec_return);
+		alert("Usuário renomeado com êxito!\n" + data.exec_return);
 		location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users";
 	}
@@ -553,5 +554,5 @@
 	clearTimeout(finderTimeout_maillist);
 	var oWait = document.getElementById("ea_span_searching_maillist");
-	oWait.innerHTML = document.getElementById('searching').value;
+	oWait.innerHTML = 'Buscando...';
 	finderTimeout_maillist = setTimeout("optionFinder_maillist('"+obj.id+"')",500);
 }
@@ -587,5 +588,5 @@
 	clearTimeout(finderTimeout_group);
 	var oWait = document.getElementById("ea_span_searching_group");
-	oWait.innerHTML = document.getElementById('searching').value;
+	oWait.innerHTML = 'Buscando...';
 	finderTimeout_group = setTimeout("optionFinder_group('"+obj.id+"')",500);
 }
@@ -653,5 +654,5 @@
 		else{
 			cExecute ('$this.user.write_log_from_ajax&_action='+action+'&userinfo='+uid, handler_write_log);
-			alert(document.getElementById('removed').value + data.inbox_size + document.getElementById('mb_from_the_user_mailbox').value);
+			alert("Esvaziados '" + data.inbox_size + "' MB da caixa postal do usuário");
 			document.getElementById('mailquota_used').value = data.mailquota_used;
 		}
Index: /trunk/expressoAdmin1_2/index.php
===================================================================
--- /trunk/expressoAdmin1_2/index.php	(revision 283)
+++ /trunk/expressoAdmin1_2/index.php	(revision 309)
@@ -34,14 +34,13 @@
 	
 	$var = Array(
-		'lang_user_accounts'	=> lang('Users'),
-		'lang_user_groups'	=> lang('Groups'),
-		'lang_email_lists'	=> lang('E-mail lists'),
+		'lang_user_accounts'	=> lang('User Accounts'),
+		'lang_user_groups'		=> lang('User Groups'),
+		'lang_email_lists'		=> lang('Email Lists'),
 		'lang_computers'		=> lang('Computers'),
-		'lang_sambadomains'	=> lang('Samba domains'),
+		'lang_sambadomains'		=> lang('Samba Domains'),
 		'lang_sectors'			=> lang('Sectors'),
-		'lang_show_sessions'	=> lang('Show sessions'),
-		'lang_organizations'	=> lang('Organizations'),
+		'lang_show_sessions'	=> lang('Show Sessions'),
 		'display_samba_suport'	=> $current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none',
-		'lang_logs'		=> lang('Show logs')
+		'lang_logs'				=> lang('Logs')
 	);
 	$template->set_var($var);
Index: /trunk/expressoAdmin1_2/templates/default/computers.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/computers.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/computers.tpl	(revision 309)
@@ -28,6 +28,6 @@
 	<td width="20%" align="center">{lang_computers_uid}</td>
 	<td width="60%" align="center">{lang_description}</td>
-    <td width="10%" align="center">{lang_edit}</td>
-    <td width="10%" align="center">{lang_delete}</td>
+    <td width="6%" align="center">{lang_edit}</td>
+    <td width="7%" align="center">{lang_delete}</td>
    </tr>
    {rows}
@@ -41,8 +41,8 @@
 <!-- BEGIN row -->
    <tr bgcolor="{tr_color}">
-    <td>{row_cn}</td>
-    <td>{row_description}</td>
-    <td align="center">{edit_link}</td>
-    <td align="center">{delete_link}</td>
+    <td width="20%">{row_cn}</td>
+    <td width="60%">{row_description}</td>
+    <td width="6%" align="center">{edit_link}</td>
+    <td width="7%" align="center">{delete_link}</td>
    </tr>
 <!-- END row -->
Index: /trunk/expressoAdmin1_2/templates/default/sectors.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/sectors.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/sectors.tpl	(revision 309)
@@ -2,5 +2,5 @@
 <form method="POST" action="{action}">
 <p>
-  <table border="0" width="50%" align="center">
+  <table border="0" width="55%" align="center">
   <tr>
 	<td align="center" "left" width="50%">
@@ -17,10 +17,10 @@
  </table>
  
- <table border="0" width="50%" align="center">
+ <table border="0" width="55%" align="center">
   <tr bgcolor="{th_bg}">
-   <td width="20%">{header_name}</td>
-   <td width="50%">{lang_add_sub_sectors}</td>
-   <td width="15%" align="center">{header_edit}</td>
-   <td width="15%" align="center">{header_delete}</td>
+   <td>{header_name}</td>
+   <td>{lang_add_sub_sectors}</td>
+   <td>{header_edit}</td>
+   <td>{header_delete}</td>
   </tr>
   {rows}
@@ -32,6 +32,6 @@
   <td>{sector_name}</td>
   <td width="25%">{add_link}</td>
-  <td width="5%" align="center">{edit_link}</td>
-  <td width="5%" align="center">{delete_link}</td>
+  <td width="5%">{edit_link}</td>
+  <td width="5%">{delete_link}</td>
  </tr>
 <!-- END row -->
Index: /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl	(revision 309)
@@ -11,16 +11,6 @@
 					<input type="hidden" name="ldap_context" value="{ldap_context}">
 					<input type="hidden" name="manager_context" value="{manager_context}">
+					<input type="hidden" name="restrictionsOnEmailLists" value="{restrictionsOnEmailLists}">
 					<input type="hidden" name="defaultDomain" value="{defaultDomain}">
-					<input type="hidden" id="login_field_has_spaces" value="{login_field_has_spaces}">
-					<input type="hidden" id="list_email_field_is_empty" value="{list_email_field_is_empty}">
-					<input type="hidden" id="no_user_is_part_of_the_list" value="{no_user_is_part_of_the_list}">
-					<input type="hidden" id="email_list_successfully_created" value="{email_list_successfully_created}">
-					<input type="hidden" id="email_list_successfully_saved" value="{email_list_successfully_saved}">
-					<input type="hidden" id="it_is_not_possible_select_users" value="{is_is_not_possible_select_users}">
-					<input type="hidden" id="email_list_successfully_deleted" value="{email_list_successfully_deleted}">
-					<input type="hidden" id="login_field_incomplete" value="{login_field_incomplete}">
-					<input type="hidden" id="field_email_is_invalid" value="{field_email_is_invalid}">
-					<input type="hidden" id="list_name_field_is_empty" value="{lang_list_name_field_is_empty}">
-					<input type="hidden" id="delete_list" value="{delete_list}">
 
 					<tr>
@@ -32,5 +22,5 @@
 					
 					<tr>
-						<td width="40%" bgcolor="#DDDDDD">
+						<td width="25%" bgcolor="#DDDDDD">
 							{lang_search_organization}:<br>
 							<input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value, ea_check_allUsers.checked);">
@@ -39,5 +29,5 @@
 							<select id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked);">{combo_manager_org}</select><br>
 							
-							{lang_maillist_uid}: <font color="blue">Ex: lista-celepar-rh</font><br>
+							{lang_maillist_uid}: <font color="blue">Ex: lista-celepar-rh</font>
 							<input id="ea_maillist_uid" name="uid" size="35" value="{uid}" autocomplete="off" onblur="javascript:emailSuggestion_maillist();"><br>
 							
@@ -48,6 +38,6 @@
 							<input name="cn" size="60" value="{cn}" autocomplete="off"><br>
 
-							{lang_email_list_empty}: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br>
-							{lang_hide_email_list}: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br>
+							Lista de E-mail está ativa: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br>
+							Ocultar Lista de E-mail ??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br>
 							
 							<b>{lang_maillist_users} (<font color=red>{user_count}</font>):</b><br>
@@ -55,5 +45,5 @@
 						</td>
 						
-						<td width="20%" valign="middle" align="center" bgcolor="#DDDDDD">
+						<td valign="middle" align="center" bgcolor="#DDDDDD">
 							<br><br><br><br><br><br>
 							<button type="button" onClick="javascript:add_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" >&nbsp;{lang_add_user}</button>
@@ -62,5 +52,5 @@
 						</td>
 						
-						<td width="40%" valign="bottom" bgcolor="#DDDDDD">
+						<td valign="bottom" bgcolor="#DDDDDD">
 							{lang_search_organization}:<br>
 							<input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_maillists');" onBlur="javascript:get_available_users(org_context.value, ea_check_allUsers.checked);">
@@ -78,5 +68,5 @@
 							<font color="red"><span id="ea_span_searching">&nbsp;</span></font>
 							<br>
-							<b>{lang_users}:</b><br>
+							<b>Usuários:</b>
 							<select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select>
 						</td>
@@ -85,5 +75,5 @@
 					<tr>
 						<td colspan="3" align="left" bgcolor="{color_bg1}">
-							<input type="button" value="{lang_save}" onClick="javascript:validate_fields('{type}','{restrictionsOnEmailLists}');">
+							<input type="button" value="{lang_save}" onClick="javascript:validate_fields('{type}');">
 							<input type="button" value="{lang_back}" onClick="document.location.href='{back_url}'">
 						</td>
Index: /trunk/expressoAdmin1_2/templates/default/managers.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/managers.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/managers.tpl	(revision 309)
@@ -1,5 +1,3 @@
 <!-- BEGIN body -->
-<input id="type_the_new_manager_login" type="hidden" value="{lang_Enter_the_new_manager_name}">
-
 <p>
   <table border="0" width="90%" align="center">
@@ -7,5 +5,5 @@
    <td align="right">
     <form method="POST" action="{action}">
-    	<input type="submit" value="{lang_Create_manager}"
+    	<input type="submit" value="{lang_add_manager}"
     </form>
    </td>
@@ -15,10 +13,10 @@
  <table border="0" width="90%" align="center">
   <tr bgcolor="{th_bg}">
-   <td width="20%" align="left"><B>{lang_Login}</B></td>
-   <td width="30%" align="left"><B>{lang_Name}</B></td>
-   <td width="20%" align="left"><B>{lang_Context}</B></td>
-   <td width="10%"  align="center"><B>{lang_Copy}</B></td>
-   <td width="10%"  align="center"><B>{lang_Edit}</B></td>
-   <td width="10%"  align="center"><B>{lang_Delete}</B></td>
+   <td width="20%" align="center"><B>{lang_manager_lid}</B></td>
+   <td width="30%" align="center"><B>{lang_manager_name}</B></td>
+   <td width="30%" align="center"><B>{lang_context}</B></td>
+   <td width="5%"  align="center"><B>{lang_edit}</B></td>
+   <td width="5%"  align="center"><B>{lang_delete}</B></td>
+   <td width="5%"  align="center"><B>{lang_copy}</B></td>
   </tr>
   {rows}
@@ -28,10 +26,10 @@
 <!-- BEGIN row -->
  <tr bgcolor="{tr_color}">
-  <td>{manager_lid}</td>
-  <td>{manager_cn}</td>
-  <td>{context}</td>
-  <td align="center">{link_copy}</td>
-  <td align="center">{link_edit}</td>
-  <td align="center">{link_delete}</td>
+  <td width="20%">{manager_lid}</td>
+  <td width="30%">{manager_cn}</td>
+  <td width="30%">{context}</td>
+  <td width="5%" align="center">{link_edit}</td>
+  <td width="5%" align="center">{link_delete}</td>
+  <td width="5%" align="center">{link_copy}</td>
  </tr>
 <!-- END row -->
Index: /trunk/expressoAdmin1_2/templates/default/maillists.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/maillists.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/maillists.tpl	(revision 309)
@@ -1,7 +1,3 @@
 <!-- BEGIN list -->
-<input type="hidden" id="delete_list" value="{lang_delete_list}">
-<input type="hidden" id="email_list_successfully_deleted" value="{lang_delete_list_success}">
-
-
 <p>
   <div align="center">
@@ -31,9 +27,11 @@
    <tr bgcolor="{th_bg}">
     <td width="20%">{lang_email_lists_uid}</td>
-    <td width="20%">{lang_email_lists_names}</td>
-    <td width="30%">{lang_email}</td>
-    <td width="10%" align="center">{lang_scl}</td>
-    <td width="10%" align="center">{lang_edit}</td>
-    <td width="20%" align="center">{lang_delete}</td>
+    <td width="40%">{lang_email_lists_names}</td>
+    <td width="40%">{lang_email}</td>
+    <td width="8%" align="center">{lang_edit}</td>
+	<td width="8%" align="center"><span title='Sending Control List'>{lang_scl}<span></td>
+	
+	
+    <td width="8%" align="center">{lang_delete}</td>
    </tr>
 
@@ -46,10 +44,10 @@
 <!-- BEGIN row -->
    <tr bgcolor="{tr_color}">
-    <td>{row_uid}</td>
-    <td>{row_name}</td>
-    <td>{row_email}</td>
-    <td align="center">{scl_link}</td>
-    <td align="center">{edit_link}</td>
-    <td align="center">{delete_link}</td>
+    <td width="20%">{row_uid}</td>
+    <td width="30%">{row_name}</td>
+    <td width="20%">{row_email}</td>
+    <td width="6%" align="center">{edit_link}</td>
+	<td width="6%" align="center">{scl_link}</td>
+    <td width="7%" align="center">{delete_link}</td>
    </tr>
 <!-- END row -->
@@ -57,8 +55,8 @@
 <!-- BEGIN row_empty -->
    <tr>
-    <td colspan="6" align="center"><font color="red"><b>{message}</b></font></td>
+    <td colspan="5" align="center"><font color="red"><b>{message}</b></font></td>
    </tr>
 	<tr>
-	<td colspan="6"><input type="button" value="{lang_back}" onClick="document.location.href='{back_url}'"></td>
+		<td><input type="button" value="{lang_back}" onClick="document.location.href='{back_url}'"></td>
 	</tr>
 <!-- END row_empty -->
Index: /trunk/expressoAdmin1_2/templates/default/maillists_scl.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/maillists_scl.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/maillists_scl.tpl	(revision 309)
@@ -11,5 +11,4 @@
 					<input type="hidden" name="ldap_context" value="{ldap_context}">
 					<input type="hidden" name="manager_context" value="{manager_context}">
-					<input type="hidden" id="sending_control_list_successfully_saved" value="{sending_control_list_successfully_saved}">
 					
 					<tr>
@@ -21,14 +20,14 @@
 					
 					<tr>
-						<td width="40%" valign="bottom" bgcolor="#DDDDDD">
-							{lang_list_email}:<br><b><span style="color:red;">{mail}<span></b><br><br>
-							{lang_apply_scl} <input type="checkbox" {accountRestrictive_checked} name="accountRestrictive"><br>
-							{lang_members_send} <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br>
+						<td width="25%" valign="bottom" bgcolor="#DDDDDD">
+							Email da Lista:<br><b><span style="color:red;">{mail}<span></b><br><br>
+							Aplicar controle de envio a esta lista ? <input type="checkbox" {accountRestrictive_checked} name="accountRestrictive"><br>
+							Participantes da lista podem enviar email ? <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br>
 							<br>
-							<b>{lang_allowed_send_email}:</b><br>
+							<b>Usuários que podem enviar email para esta lista:</b><br>
 							<select id="ea_select_users_SCL_Maillist" name="members[]" style="width:400px; height:200px" multiple size="13">{ea_select_users_SCL_Maillist}</select>
 						</td>
 						
-						<td width="20%" valign="middle" align="center" bgcolor="#DDDDDD">
+						<td valign="middle" align="center" bgcolor="#DDDDDD">
 							<br><br><br><br><br><br>
 							<button type="button" onClick="javascript:add_user2scl_maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" >&nbsp;{lang_add_user}</button>
@@ -37,6 +36,6 @@
 						</td>
 						
-						<td width="40%" valign="bottom" bgcolor="#DDDDDD">
-							{lang_organization}&nbsp;
+						<td valign="bottom" bgcolor="#DDDDDD">
+							Organizações:<br>
 							<select name="org_context" id="ea_combo_org_maillists" onchange="javascript:get_available_users(this.value, ea_check_allUsers.checked);">{combo_org}</select>
 							
@@ -45,10 +44,10 @@
 							<br><br>
 							
-							{lang_search_user}:<br>
+							Procurar usuário:<br>
 							<input id="ea_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this)"><br>
 							
 							<font color="red"><span id="ea_span_searching">&nbsp;</span></font>
 							<br>
-							<b>{lang_users}:</b><br>
+							<b>Usuários:</b>
 							<select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select>
 						</td>
Index: /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl	(revision 309)
@@ -22,44 +22,4 @@
 <input type="hidden" name="defaultDomain"		value="{defaultDomain}">
 <input type="hidden" name="ldap_context"		value="{ldap_context}">
-<input id="characters" type="hidden" value="{characters}">
-<input id="cpf_field_not_allowed" type="hidden" value="{cpf_field_not_allowed}">
-<input id="default_password_successfully_registered_cadastre" type="hidden" value="{default_password_registered}">
-<input id="delete_the_group" type="hidden" value="{delete_the_group}">
-<input id="delete_the_list" type="hidden" value="{delete_the_list}">
-<input id="email_field_empty" type="hidden" value="{email_field_empty}">
-<input id="email_field_not_valid" type="hidden" value="{email_field_not_valid}">
-<input id="first_name_empty" type="hidden" value="{first_name_empty}">
-<input id="first_name_not_valid" type="hidden" value="{first_name_not_valid}">
-<input id="group_name_field_incomplete" type="hidden" value="{group_name_field_incomplete}">
-<input id="last_name_empty" type="hidden" value="{last_name_empty}">
-<input id="last_name_not_valid" type="hidden" value="{last_name_not_valid}">
-<input id="list_login_field_incomplete" type="hidden" value="{list_login_field_incomplete}">
-<input id="login_field_contains_not_allowed" type="hidden" value="{login_field_contains_not_allowed}">
-<input id="login_field_empty" type="hidden" value="{login_field_empty}">
-<input id="login_field_must_have" type="hidden" value="{login_field_must_have}">
-<input id="no_group_selected" type="hidden" value="{no_group_selected}">
-<input id="page_not_found" type="hidden" value="{page_not_found}">
-<input id="pass_re-pass_diferents" type="hidden" value="{pass_re-pass_diferents}">
-<input id="password_field_empty" type="hidden" value="{password_field_empty}">
-<input id="redirect_email_empty" type="hidden" value="{redirect_email_empty}">
-<input id="register_field_contains_not_allowed" type="hidden" value="{register_field_contains_not_allowed}">
-<input id="re-password_field_empty" type="hidden" value="{re-pass_field_empty}">
-<input id="searching" type="hidden" value="{searching}">
-<input id="telephone_empty" type="hidden" value="{telephone_empty}">
-<input id="type_name_new_manager" type="hidden" value="{type_name_new_manager}">
-<input id="user_deleted_with_success" type="hidden" value="{user_deleted_with_success}">
-<input id="user_home_path_empty" type="hidden" value="{user_home_path_empty}">
-<input id="user_logon_script_empty" type="hidden" value="{user_logon_script_empty}">
-<input id="user_password_returned_with_success" type="hidden" value="{user_password_returned_with_success}">
-<input id="user_successfully_created" type="hidden" value="{user_successfully_created}">
-<input id="user_successfully_saved" type="hidden" value="{user_successfully_saved}">
-<input id="without_quota" type="hidden" value="{without_quota}">
-<input id="cpf_field_invalid" type="hidden" value="{cpf_field_invalid}">
-<input id="delete_the_user" type="hidden" value="{delete_the_user}">
-<input id="to" type="hidden" value="{to}">
-<input id="user_renamed_success" type="hidden" value="{user_renamed_success}">
-<input id="removed" type="hidden" value="{removed}">
-<input id="mb_from_the_user_mailbox" type="hidden" value="{mb_from_the_user_mailbox}">
-<input id="cleaning_users_inbox" type="hidden" value="{cleaning_users_inbox}">
 
 <br>
@@ -119,6 +79,6 @@
 			<td width="15%">&nbsp;</td>
 			<td width="35%">
-				<input type='button' value='{lang_insert_password_default}' onclick="javascript:set_user_default_password();">
-				<input type='button' value='{lang_restore_user_password}' onclick="javascript:return_user_password();">
+				<input type='button' value='Inserir senha padrão' onclick="javascript:set_user_default_password();">
+				<input type='button' value='Retornar senha do usuário' onclick="javascript:return_user_password();">
 			</td>
 		</tr>
@@ -131,5 +91,5 @@
 				<img align="center" src="{photo_bin}" id="ea_img_photo" border="0">
 				<input type="file" id="ea_input_photo" name="photo" {disabled_edit_photo} size=20><br>
-				<input type="checkbox" {disabled_delete_photo} {disabled_edit_photo} name="delete_photo" value="1">{lang_delete_photo}
+				<input type="checkbox" {disabled_delete_photo} {disabled_edit_photo} name="delete_photo" value="1">Deletar foto
 			</td>
 		</tr>
@@ -155,6 +115,6 @@
 		</tr>		
 
-		<tr bgcolor={row_on} style='display:{display_access_records}'>
-			<td><input type='button' {disabled} {disabled_access_button} value='{lang_access_records}' onclick="document.location.href='./index.php?menuaction=expressoAdmin1_2.uiaccounts.show_access_log&account_id={uidnumber}';"></td>
+		<tr bgcolor={row_on}>
+			<td><input type='button' {disabled} {disabled_access_button} value='Exibir registros de acesso' onclick="document.location.href='./index.php?menuaction=expressoAdmin1_2.uiaccounts.show_access_log&account_id={uidnumber}';"></td>
 		</tr>
 	</table>
@@ -229,7 +189,6 @@
 		</tr>
 
-		<tr bgcolor={row_on}  style='display:{display_tr_inbox_user}'>
-			<td>{lang_inbox_user}:</td>
-			<td><input type='button' {disabled} {disabled_empty_inbox} value='{lang_clear_inbox_user}' onclick="javascript:empty_inbox(uid.value);"></td>
+		<tr bgcolor={row_on}>
+			<td><input type='button' {disabled} {disabled_empty_inbox} value='Limpar INBOX do usuário' onclick="javascript:empty_inbox(uid.value);"></td>
 		</tr>
 
@@ -239,5 +198,5 @@
 <!-- The code for Group -->
 <div id="tabcontent4" class="inactivetab">
-	<table width="80%" border="0" cellspacing="4" cellpading="0">
+	<table width="60%" border="0" cellspacing="4" cellpading="0">
 		<tr bgcolor={row_on}>
 			
@@ -245,7 +204,7 @@
 				<table width="100%" border="0">
 					<tr>
-						<td width="40%">
-							<br>{lang_user_groups}:<br>
-							<select id="ea_select_user_groups" size="10" style="width: 400px" multiple name="groups[]">{ea_select_user_groups_options}</select>
+						<td width="40%" align="center">
+							<br>{lang_user_groups}<br><br>
+							<select id="ea_select_user_groups" size="10" style="width: 300px" multiple name="groups[]">{ea_select_user_groups_options}</select>
 						</td>
 					</tr>
@@ -271,5 +230,5 @@
 					<tr>
 						<td>
-							{lang_search_group}:<br>
+							Procurar grupo:<br>
 							<input {disabled} id="ea_input_searchGroup" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout_group(this)"><br>
 							<font color="red"><span id="ea_span_searching_group">&nbsp;<span></font>
@@ -280,6 +239,6 @@
 					<tr>
 						<td width="40%">
-							{lang_available_groups}:<br>
-							<select {disabled} id="ea_select_available_groups" size="10" style="width:400px" multiple></select>
+							{lang_available_groups}<br>
+							<select {disabled} id="ea_select_available_groups" size="10" style="width:300px" multiple></select>
 						</td>
 					</tr>
@@ -299,5 +258,5 @@
 <!-- The code for lists Email -->
 <div id="tabcontent5" class="inactivetab">
-	<table width="80%" border="0" cellspacing="4" cellpading="0">
+	<table width="60%" border="0" cellspacing="4" cellpading="0">
 		<tr bgcolor={row_on}>
 		
@@ -305,6 +264,6 @@
 				<table width="100%" border="0">
 					<tr>
-						<td width="40%">
-							<br>{lang_user_mail_lists}:<br>
+						<td width="40%" align="center">
+							<br>{lang_user_mail_lists}:<br><br>
 							<select id="ea_select_user_maillists" size="13" style="width: 400px" multiple name="maillists[]">{ea_select_user_maillists_options}</select>
 						</td>
@@ -313,5 +272,5 @@
 			</td>
 			
-			<td width="20%" align="center">
+			<td width="20%">
 				<button type="button" {disabled} onClick="javascript:add_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" >&nbsp;{lang_add}</button>
 				<br><br>
@@ -335,5 +294,5 @@
 					<tr>
 						<td>
-							{lang_search_list}:<br>
+							Procurar lista:<br>
 							<input {disabled} id="ea_input_searchMailList" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout_maillist(this)"><br>
 							<font color="red"><span id="ea_span_searching_maillist">&nbsp;<span></font>
Index: /trunk/expressoAdmin1_2/templates/default/groups_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/groups_form.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/groups_form.tpl	(revision 309)
@@ -13,16 +13,4 @@
 					<input type="hidden" name="ufn_ldap_context"	value="{ufn_ldap_context}">
 					<input type="hidden" name="manager_context"		value="{manager_context}">
-					<input type="hidden" id="group_name_field_is_empty"	value="{group_name_field_is_empty}">
-					<input type="hidden" id="description_field_is_empty"	value="{description_field_is_empty}">
-					<input type="hidden" id="group_name_field_not_allowed"		value="{group_name_field_not_allowed}">
-					<input type="hidden" id="description_field_not_allowed"	value="{description_field_not_allowed}">
-					<input type="hidden" id="group_successfully_created"	value="{group_successfully_created}">
-					<input type="hidden" id="group_successfully_saved"	value="{group_successfully_saved}">
-					<input type="hidden" id="not_possible_select_all_users"	value="{not_possible_select_all_users}">
-					<input type="hidden" id="group_successfully_delete"	value="{group_successfuuly_deleted}">
-					<input type="hidden" id="field_name_is_incomplete"	value="{field_name_is_incomplete}">
-					<input type="hidden" id="field_email_is_invalid"	value="{field_email_is_invalid}">
-					<input type="hidden" id="delete_group"	value="{delete_group}">
-
 					
 					<tr>
@@ -34,13 +22,14 @@
 
 					<tr>
-						<td width="40%" bgcolor="#DDDDDD">
+						<td width="25%" bgcolor="#DDDDDD">
 							{lang_search_organization}:<br>
 							<input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value);" onBlur="javascript:sinc_combos_org(context.value, ea_check_allUsers.checked); get_available_sambadomains(context.value, '{type}')">
 							<br>
-							{lang_organization}:<br>
+							{lang_group_organization}:<br>
 							<select id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked); get_available_sambadomains(this.value, '{type}')">{combo_manager_org}</select><br>
-							{lang_group_name}:  <font color="blue">Ex: grupo-celepar-rh</font><br>
+							{lang_group_name}: <font color="blue">Ex: grupo-celepar-rh</font>
+							<!--<input name="cn" size="35" value="{cn}" autocomplete="off" onKeyUp="javascript:groupEmailSuggestion('{concatenateDomain}','{type}')"><br>-->
 							<input name="cn" size="35" value="{cn}" autocomplete="off"><br>
-							{lang_email}: <font color="blue">Ex: grupo-celepar-rh@celepar.pr.gov.br</font><br>
+							{lang_email}:<br>
 							<input name="email" size="60" value="{email}" {disable_email_groups} autocomplete="off"><br>
 							{lang_description}:<br>
@@ -49,5 +38,5 @@
 								<table border="0">
 									<tr bgcolor={row_on}>
-										<td>{lang_samba_attributes}:</td>
+										<td>Usar atributos Samba:</td>
 										<td>						
 											<input type="checkbox" {use_attrs_samba_checked} name="use_attrs_samba" onChange="javascript:use_samba_attrs(this.checked)">
@@ -55,5 +44,5 @@
 									</tr>
 									<tr>
-										<td>{lang_domain}:</td>
+										<td>Domínio:</td>
 										<td>
 											<select {disabled_samba} name="sambasid" id="ea_combo_sambadomains">
@@ -64,5 +53,5 @@
 								</table>
 							</div>
-							{lang_invisible_group}: <input type="checkbox" {phpgwaccountvisible_checked} name="phpgwaccountvisible"><br>							
+							Ocultar este grupo no Expresso? <input type="checkbox" {phpgwaccountvisible_checked} name="phpgwaccountvisible"><br>							
 							
 							<b>{lang_group_users} (<font color=red>{user_count}</font>):</b><br>
@@ -70,5 +59,5 @@
 						</td>
 						
-						<td width="20%" valign="middle" align="center" bgcolor="#DDDDDD">
+						<td valign="middle" align="center" bgcolor="#DDDDDD">
 							<br><br><br><br><br><br>
 							<button type="button" onClick="javascript:add_user2group();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" >&nbsp;{lang_add_user}</button>
@@ -77,6 +66,6 @@
 						</td>
 						
-						<td width="40%" valign="bottom" bgcolor="#DDDDDD">
-							{lang_organization}:<br>
+						<td valign="bottom" bgcolor="#DDDDDD">
+							Organizações:<br>
 							<select name="org_context" id="ea_combo_org_groups" onchange="javascript:get_available_users(this.value, ea_check_allUsers.checked);">{combo_all_orgs}</select>
 							
@@ -85,10 +74,10 @@
 							<br><br>
 							
-							{lang_search_user}:<br>
+							Procurar usuário:<br>
 							<input id="ea_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this)"><br>
 							
 							<font color="red"><span id="ea_span_searching">&nbsp;</span></font>
 							<br>
-							<b>{lang_users}:</b><br>
+							<b>Usuários:</b>
 							<select id="ea_select_available_users" style="width: 400px" multiple size="13"></select>
 						</td>
Index: /trunk/expressoAdmin1_2/templates/default/computers_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/computers_form.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/computers_form.tpl	(revision 309)
@@ -53,5 +53,5 @@
 								</tr>
 								
-								<tr bgcolor={row_on}>
+								<tr bgcolor={row_off}>
 									<td width="25%">{lang_computer_cn}:</td>
 									<td>
@@ -60,5 +60,5 @@
 								</tr>
 								
-								<tr bgcolor={row_off}>
+								<tr bgcolor={row_on}>
 									<td>{lang_computer_type}:</td>
 									<td>
Index: /trunk/expressoAdmin1_2/templates/default/logs.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/logs.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/logs.tpl	(revision 309)
@@ -62,8 +62,8 @@
 		<table border="0" width="90%">	
 			<tr bgcolor="{th_bg}">
-				<td width="15%">{lang_manager_lid}</td>
-				<td width="55%">{lang_action}</td>
-				<td width="20%" align="center">{lang_date}</td>				
-				<td width="10%" align="center">{lang_view}</td>
+				<td width="10%" align="center">{lang_manager_lid}</td>
+				<td width="35%" align="center">{lang_action}</td>
+				<td width="35%" align="center">{lang_date}</td>				
+				<td width="5%" align="center">{lang_view}</td>
 			</tr>
 			{rows}
@@ -73,8 +73,8 @@
 <!-- BEGIN row -->
 	<tr bgcolor="{tr_color}">
-		<td>{row_manager_lid}</td>
-		<td>{row_action}</td>
-		<td align="center">{row_date}</td>
-		<td align="center">{row_view}</td>
+		<td width="10%" align="center">{row_manager_lid}</td>
+		<td width="35%" align="center">{row_action}</td>
+		<td width="35%" align="center">{row_date}</td>
+		<td width="5%" align="center">{row_view}</td>
 	</tr>
 <!-- END row -->
Index: /trunk/expressoAdmin1_2/templates/default/index.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/index.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/index.tpl	(revision 309)
@@ -46,5 +46,5 @@
 		</td>
 		<td>
-			<a href="../index.php?menuaction=expressoAdmin1_2.uisectors.list_sectors">{lang_organizations}</a>
+			<a href="../index.php?menuaction=expressoAdmin1_2.uisectors.list_sectors">Organizações</a>
 		</td>
 	</tr> 
Index: /trunk/expressoAdmin1_2/templates/default/groups.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/groups.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/groups.tpl	(revision 309)
@@ -1,5 +1,3 @@
 <!-- BEGIN list -->
-<input id="delete_group" type="hidden" value="{lang_delete_group}">
-
 <p>
   <div align="center">
Index: /trunk/expressoAdmin1_2/templates/default/accounts.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/accounts.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/accounts.tpl	(revision 309)
@@ -1,11 +1,4 @@
 <!-- BEGIN body -->
 <input type="hidden" id="accounts_form_imapDelimiter" value="{imapDelimiter}">
-<input id="delete_the_user" type="hidden" value="{lang_delete_user}">
-<input id="user_deleted_with_success" type="hidden" value="{lang_sucess}">
-<input id="change_user_login" type="hidden" value="{lang_rename_user}">
-<input id="to" type="hidden" value="{lang_to}">
-<input id="user_renamed_success" type="hidden" value="{lang_success}">
-<input id="login_field_contains_not_allowed" type="hidden" value="{login_field_contains_not_allowed}">
-
 {error_messages}
 <p>
@@ -37,8 +30,8 @@
 				<td width="20%">{lang_loginid}</td>
 				<td width="30%">{lang_cn}</td>
-				<td width="35%">{lang_mail}</td>
-				<td width="5%" align="center">{lang_rename}</td>
-				<td width="5%" align="center">{lang_edit}</td>
-				<td width="5%" align="center">{lang_delete}</td>
+				<td width="30%">{lang_mail}</td>
+				<td width="5%">{lang_edit}</td>
+				<td width="5%">{lang_rename}</td>
+				<td width="5%">Excluir</td>
 			</tr>
 			{rows}
@@ -54,7 +47,7 @@
 		<td>{row_cn}</td>
 		<td>{row_mail}</td>
-		<td align="center">{row_rename}</td>
-		<td align="center">{row_edit}</td>
-		<td align="center">{row_delete}</td>
+		<td width="5%">{row_edit}</td>
+		<td width="5%">{row_rename}</td>
+		<td width="5%">{row_delete}</td>
 	</tr>
 <!-- END row -->
Index: /trunk/expressoAdmin1_2/templates/default/managers_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/managers_form.tpl	(revision 283)
+++ /trunk/expressoAdmin1_2/templates/default/managers_form.tpl	(revision 309)
@@ -6,16 +6,8 @@
 <form action="{action}" name="managers_form" method="post">
  	<div align="center">
-	<input type="hidden" id="the_field_manager_lid_is_empty" value="{the_field_manager_lid_is_empty}">
-	<input type="hidden" id="context_empty" value="{context_empty}">
-	<input type="hidden" id="error_at_copy_manager" value="{error_at_copy_manager}">
-	<input type="hidden" id="type_the_new_manager_login" value="{type_the_new_manager_login}">
+ 	
  	<input type=hidden name="type" value="{type}">
 	<input type=hidden name="hidden_manager_lid" value="{hidden_manager_lid}">
-	<input type=hidden name="old_manager_lid" value="{old_manager_lid}">
-	<input type=hidden name="old_context" value="{old_context}">
 	<input type=hidden name="context">
-    	<input id="manager_created" type="hidden" value="{manager_created}">
-    	<input id="manager_salved" type="hidden" value="{manager_salved}">
-
     
 	<table border="0" width="90%">
@@ -28,10 +20,10 @@
 			</tr>
 			<td valign="top">
-				<table border="0" width=100%>
+				<table border=0 width=100%>
 					<tr bgcolor="{color_bg2}">
-						<td colspan="2"><b>{lang_Administrator_informations}</b></td>
+						<td colspan="2"><b>Informações sobre o Administrador</b></td>
 					</tr>				
 			    	<tr bgcolor="{color_font1}">
-			    		<td width="25%">{lang_Search_manager}:</td>
+			    		<td width="25%">{lang_search_for_manager}:</td>
 						<td>
 							<input type="text" id="manager_lid" {input_manager_lid_disabled} name="manager_lid" value="{manager_lid}" size=30 autocomplete="off" onkeyup="javascript:search_manager(this.value)"></input>
@@ -41,5 +33,5 @@
 					
 					<tr bgcolor="{color_font1}" style="display:{display_manager_select}">
-						<td width="25%">{lang_Found_managers}:</td>
+						<td width="25%">{lang_found_managers}:</td>
 						<td>
 							<select id="ea_select_managers" name="ea_select_manager" style="width: 400px" size="10">{ea_select_managers}</select>
@@ -57,5 +49,5 @@
 			    	</tr>
 					<tr bgcolor="{color_bg2}">
-						<td colspan="2"><b>{lang_ACL_informations}</b></td>
+						<td colspan="2"><b>Informações da ACL</b></td>
 					</tr>
 
@@ -65,70 +57,70 @@
 					<table id="ea_table_acl">
 					    <tr bgcolor="{color_font2}">
-							<td width="20%"><input type="button" value="{lang_Select_all}" onclick="select_all_acls('ea_table_acl');"></td>
+							<td width="20%"><input type="button" value="Selecionar todos os direitos" onclick="select_all_acls('ea_table_acl');"></td>
 					    </tr>
 					    <tr bgcolor="{color_font1}" align='right'>
-							<td width="20%">{lang_Create_user}:</td>
+							<td width="20%">{lang_add_users}:</td>
 							<td width="2%"><input type="checkbox" name="acl_add_users" value="1" {acl_add_users}></td>
-							<td width="20%">{lang_Create_group}:</td>
+							<td width="20%">{lang_add_groups}:</td>
 							<td width="2%"><input type="checkbox" name="acl_add_groups" value="16" {acl_add_groups}></td>							
-							<td width="20%">{lang_Create_e-mail_list}:</td>
+							<td width="20%">{lang_add_email_lists}:</td>
 							<td width="2%"><input type="checkbox" name="acl_add_maillists" value="256" {acl_add_maillists}></td>
-							<td width="20%">{lang_Create_sector}:</td>
+							<td width="20%">{lang_create_organizations}:</td>
 							<td width="2%"><input type="checkbox" name="acl_create_sectors" value="4096" {acl_create_sectors}></td>
 					    </tr>
 					    <tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_Edit_user}:</td>
+							<td>{lang_edit_users}:</td>
 							<td><input type="checkbox" name="acl_edit_users" value="2" {acl_edit_users}></td>
-							<td>{lang_Edit_group}:</td>
+							<td>{lang_edit_groups}:</td>
 							<td><input type="checkbox" name="acl_edit_groups" value="32" {acl_edit_groups}></td>
-							<td>{lang_Edit_e-mail_list}:</td>
+							<td>{lang_edit_email_lists}:</td>
 							<td><input type="checkbox" name="acl_edit_maillists" value="512" {acl_edit_maillists}></td>
-							<td>{lang_Edit_sector}:</td>
+							<td>{lang_edit_organizations}:</td>
 							<td><input type="checkbox" name="acl_edit_sectors" value="8192" {acl_edit_sectors}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Delete_user}:</td>
+							<td>{lang_delete_users}:</td>
 							<td><input type="checkbox" name="acl_delete_users" value="4" {acl_delete_users}></td>
-							<td>{lang_Delete_group}:</td>
+							<td>{lang_delete_groups}:</td>
 							<td><input type="checkbox" name="acl_delete_groups" value="64" {acl_delete_groups}></td>
-							<td>{lang_Delete_e-mail_list}:</td>
+							<td>{lang_delete_email_lists}:</td>
 							<td><input type="checkbox" name="acl_delete_maillists" value="1024" {acl_delete_maillists}></td>
-							<td>{lang_Delete_sector}:</td>
+							<td>{lang_delete_organizations}:</td>
 							<td><input type="checkbox" name="acl_delete_sectors" value="16384" {acl_delete_sectors}></td>
 						</tr>
 						<tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_Rename_user}:</td>
+							<td>{lang_rename_users}:</td>
 							<td><input type="checkbox" name="acl_rename_users" value="8388608" {acl_rename_users}></td>
-							<td>{lang_Edit_email_group}:</td>
+							<td>{lang_edit_email_attribute_from_the_groups}:</td>
 							<td><input type="checkbox" name="acl_edit_email_groups" value="67108864" {acl_edit_email_groups}></td>
-							<td>{lang_Edit_sending_control_list}:</td>
+							<td>{lang_edit_SCL_email_lists}:</td>
 							<td><input type="checkbox" name="acl_edit_scl_email_lists" value="1073741824" {acl_edit_scl_email_lists}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Corporative_information}:</td>
+							<td>{lang_manipulate_corporative_information}:</td>
 							<td><input type="checkbox" name="acl_manipulate_corporative_information" value="268435456" {acl_manipulate_corporative_information}></td>
 						</tr>
 						<tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_View_user}:</td>
+							<td>{lang_view_user}:</td>
 							<td><input type="checkbox" name="acl_view_users" value="33554432" {acl_view_users}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Edit_user_photo}:</td>
+							<td>{lang_edit_users_picture}:</td>
 							<td><input type="checkbox" name="acl_edit_users_picture" value="536870912" {acl_edit_users_picture}></td>
 						</tr>
 						<tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_Change_user_password}:</td>
+							<td>{lang_change_users_password}:</td>
 							<td><input type="checkbox" name="acl_change_users_password" value="128" {acl_change_users_password}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Change_user_quote}:</td>
+							<td>{lang_change_users_quote}:</td>
 							<td><input type="checkbox" name="acl_change_users_quote" value="262144" {acl_change_users_quote}></td>
 						</tr>
 						<tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_Insert_default_user_password}:</td>
+							<td>{lang_set_default_users_password}:</td>
 							<td><input type="checkbox" name="acl_set_user_default_password" value="524288" {acl_set_user_default_password}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Clear_user_inbox}:</td>
+							<td>{lang_empty_user_inbox}:</td>
 							<td><input type="checkbox" name="acl_empty_user_inbox" value="134217728" {acl_empty_user_inbox}></td>
 						</tr>
@@ -136,9 +128,9 @@
 						<tr><td>&nbsp;</td></tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td style="{display_samba_suport}">{lang_Edit_Samba_user_attribute}:</td>
+							<td style="{display_samba_suport}">{lang_edit_SAMBA_users_attributes}:</td>
 							<td style="{display_samba_suport}"><input type="checkbox" name="acl_edit_sambausers_attributes" value="32768" {acl_edit_sambausers_attributes}></td>
 						</tr>
 						<tr bgcolor="{color_font2}" align='right'>
-							<td style="{display_samba_suport}">{lang_Edit_Samba_user_domain}:</td>
+							<td style="{display_samba_suport}">{lang_edit_SAMBA_domains}:</td>
 							<td style="{display_samba_suport}"><input type="checkbox" name="acl_edit_sambadomains" value="16777216" {acl_edit_sambadomains}></td>
 						</tr>
@@ -146,13 +138,13 @@
 
 						<tr bgcolor="{color_font2}" align='right'>
-							<td>{lang_Show_sessions}:</td>
+							<td>{lang_show_sessions}:</td>
 							<td><input type="checkbox" name="acl_view_global_sessions" value="65536" {acl_view_global_sessions}></td>
-							<td style="{display_samba_suport}">{lang_Create_computer}:</td>
+							<td style="{display_samba_suport}">{lang_create_computers}:</td>
 							<td style="{display_samba_suport}"><input type="checkbox" name="acl_create_computers" value="1048576" {acl_create_computers}></td>
 						</tr>
 						<tr bgcolor="{color_font1}" align='right'>
-							<td>{lang_Show_logs}:</td>
+							<td>{lang_view_logs}:</td>
 							<td><input type="checkbox" name="acl_view_logs" value="131072" {acl_view_logs}></td>
-							<td style="{display_samba_suport}">{lang_Edit_computer}:</td>
+							<td style="{display_samba_suport}">{lang_edit_computers}:</td>
 							<td style="{display_samba_suport}"><input type="checkbox" name="acl_edit_computers" value="2097152" {acl_edit_computers}></td>
 						</tr>
@@ -160,5 +152,5 @@
 							<td>&nbsp;</td>
 							<td>&nbsp;</td>
-							<td style="{display_samba_suport}">{lang_Delete_computer}:</td>
+							<td style="{display_samba_suport}">{lang_delete_computers}:</td>
 							<td style="{display_samba_suport}"><input type="checkbox" name="acl_delete_computers" value="4194304" {acl_delete_computers}></td>
 						</tr>
@@ -168,9 +160,9 @@
 					
 					<tr bgcolor="{color_bg2}">
-					  <td colspan="4"><b>{lang_Allowed_applications}</b></td>
+					  <td colspan="4"><b>Seleção de Aplicativos disponíveis para o Gerente.</b></td>
 					</tr>
-					<table id="ea_table_app" border="0" width="100%">
+					<table id="ea_table_app">
 						<tr bgcolor="{color_font2}">
-							<td width="20%"><input type="button" value="{lang_Select_all}" onclick="select_all_acls('ea_table_app');"></td>
+							<td width="20%"><input type="button" value="Selecionar todos os aplicativos" onclick="select_all_acls('ea_table_app');"></td>
 					    </tr>
 						<tr>
