From 957dc2a2675a709ef8e0e4131cd5d946e0d92665 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 7 May 2007 11:15:55 +0000 Subject: [PATCH] Typo + laout fixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6275 594d385d-05f5-0310-b6e9-bd551577e9d8 --- setup/class_setupStep_Migrate.inc | 27 ++++++++++++------------ setup/setup_migrate.tpl | 34 +++++++++++++++---------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index 6e3da5720..9a5fc8ca4 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -134,7 +134,7 @@ class Step_Migrate extends setup_step $this->checks['users_visible']['ERROR_MSG'] = ""; $this->check_gosaAccounts(); - $this->checks['acls']['TITLE'] = _("Checking for administrational account"); + $this->checks['acls']['TITLE'] = _("Checking for super administrator"); $this->checks['acls']['STATUS'] = FALSE; $this->checks['acls']['STATUS_MSG']= ""; $this->checks['acls']['ERROR_MSG'] = ""; @@ -187,7 +187,7 @@ class Step_Migrate extends setup_step $res = $ldap->search("uidNumber=*",array("dn","uidNumber")); if(!$res){ $this->checks['uidNumber_usage']['STATUS'] = FALSE; - $this->checks['uidNumber_usage']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['uidNumber_usage']['STATUS_MSG']= _("LDAP query failed"); $this->checks['uidNumber_usage']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -236,7 +236,7 @@ class Step_Migrate extends setup_step $res = $ldap->search("gidNumber=*",array("dn","gidNumber")); if(!$res){ $this->checks['gidNumber_usage']['STATUS'] = FALSE; - $this->checks['gidNumber_usage']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['gidNumber_usage']['STATUS_MSG']= _("LDAP query failed"); $this->checks['gidNumber_usage']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -298,7 +298,7 @@ class Step_Migrate extends setup_step $res = $ldap->search("(&(objectClass=".$oc.")(uid=*$))",array("dn","sambaSID")); if(!$res){ $this->checks['outside_winstations']['STATUS'] = FALSE; - $this->checks['outside_winstations']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['outside_winstations']['STATUS_MSG']= _("LDAP query failed"); $this->checks['outside_winstations']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -344,7 +344,7 @@ class Step_Migrate extends setup_step $res = $ldap->search("(objectClass=posixGroup)",array("dn")); if(!$res){ $this->checks['outside_groups']['STATUS'] = FALSE; - $this->checks['outside_groups']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['outside_groups']['STATUS_MSG']= _("LDAP query failed"); $this->checks['outside_groups']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -390,7 +390,7 @@ class Step_Migrate extends setup_step $res = $ldap->search("(&(objectClass=gosaAccount)(!(uid=*$)))",array("dn")); if(!$res){ $this->checks['outside_users']['STATUS'] = FALSE; - $this->checks['outside_users']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['outside_users']['STATUS_MSG']= _("LDAP query failed"); $this->checks['outside_users']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -450,7 +450,7 @@ class Step_Migrate extends setup_step $res = $ldap->cat($cv['base']); if(!$res){ $this->checks['permissions']['STATUS'] = FALSE; - $this->checks['permissions']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['permissions']['STATUS_MSG']= _("LDAP query failed"); $this->checks['permissions']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); return(false); } @@ -534,7 +534,7 @@ class Step_Migrate extends setup_step /* No invisible */ if(!$res){ $this->checks['users_visible']['STATUS'] = FALSE; - $this->checks['users_visible']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['users_visible']['STATUS_MSG']= _("LDAP query failed"); $this->checks['users_visible']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); }elseif(count($this->users_to_migrate) == 0){ $this->checks['users_visible']['STATUS'] = TRUE; @@ -662,7 +662,7 @@ class Step_Migrate extends setup_step */ if(!$res){ $this->checks['deps_visible']['STATUS'] = FALSE; - $this->checks['deps_visible']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['deps_visible']['STATUS_MSG']= _("LDAP query failed"); $this->checks['deps_visible']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); }elseif(count($this->deps_to_migrate) == 0 ){ $this->checks['deps_visible']['STATUS'] = TRUE; @@ -749,7 +749,7 @@ class Step_Migrate extends setup_step "(objectClass=inetOrgPerson)(objectClass=organizationalPerson)))"); if(!$res){ $this->checks['acls']['STATUS'] = FALSE; - $this->checks['acls']['STATUS_MSG']= _("Ldap query failed."); + $this->checks['acls']['STATUS_MSG']= _("LDAP query failed"); $this->checks['acls']['ERROR_MSG'] = _("Possibly the 'root object' is missing."); }elseif($ldap->count()){ $this->checks['acls']['STATUS'] = TRUE; @@ -758,7 +758,8 @@ class Step_Migrate extends setup_step }else{ $this->checks['acls']['STATUS'] = FALSE; $this->checks['acls']['STATUS_MSG']= _("Failed"); - $this->checks['acls']['ERROR_MSG'].= ""; + $this->checks['acls']['ERROR_MSG']= _("There is no GOsa administrator account inside your LDAP.")." "; + $this->checks['acls']['ERROR_MSG'].= ""; } return($ldap->count()>=1); } @@ -1393,7 +1394,7 @@ class Step_Migrate extends setup_step if($just_check){ $this->checks['root']['STATUS'] = FALSE; $this->checks['root']['STATUS_MSG']= _("Failed"); - $this->checks['root']['ERROR_MSG'] = "The ldap root object is missing, but it is required to use GOsa. "; + $this->checks['root']['ERROR_MSG'] = _("The LDAP root object is missing. It is required to use your LDAP service.").' '; $this->checks['root']['ERROR_MSG'].= ""; return(FALSE); }else{ @@ -1653,7 +1654,7 @@ class Step_Migrate extends setup_step /* Display warning if copy failed */ if(!$res){ - print_red(_("Failed to copy '%s' to '%s'. Ldap says '%s'."),$source,$destination,$ldap->get_error()); + print_red(_("Failed to copy '%s' to '%s'. LDAP says '%s'."),$source,$destination,$ldap->get_error()); }else{ $res = $ldap->rmDir($source); show_ldap_error($ldap->get_error(),_("Something went wrong while copying dns.")); diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl index 5f6fde3bb..7ae6c6f38 100644 --- a/setup/setup_migrate.tpl +++ b/setup/setup_migrate.tpl @@ -15,7 +15,7 @@
{/if} -
{$checks.$key.TITLE}
+
{$checks.$key.TITLE}
{if $checks.$key.STATUS}
{$checks.$key.STATUS_MSG}
@@ -174,8 +174,6 @@ {elseif $method == "create_acls"} -

{t}Acl setup{/t}

- {if $acl_create_selected != "" && $what_will_be_done_now!=""} 
@@ -185,10 +183,11 @@
 			
 			
 		{else}
-		{t}Create a new user with adminstrational acls{/t}

+			
{t}Create a new GOsa administrator account{/t}

 	
-			{t}To automatically add a new administrative user to your ldap database use the formular below.{/t}

-			

+			

+			{t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}
+			

 			

 				

 					
@@ -216,22 +215,18 @@
 				

 				
 					

-						{t}Retype password{/t}: 
+						{t}Password (again){/t}: 
 					
 					
 						

 							
 				

 			

-				
-			

 			
 			{if $users_cnt != 0 || $groups_cnt != 0}
 			
-			
 

-			{t}Append administrational acls to existing an user or a group{/t}

-			{t}To grant administrative permissions to a user or a group, select an element and use button below.{/t}
-			

+			
{t}Assign super administrator permissions to an existing user or group{/t}

+			
{t}To grant administrative permissions to a user or a group, select an object and choose 'Assign'.{/t}

 			
-
-				
-			

 			{/if}
 		{/if}
 
 
 			
 
	
 
-			

-				
+			

+				{if $users_cnt != 0 || $groups_cnt != 0}
+				
+				{else}
+					
+				{/if}
+				 
+				
 			

 		
 
-- 
2.30.2