Code

Fixed strings
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 18 Mar 2008 20:26:47 +0000 (20:26 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 18 Mar 2008 20:26:47 +0000 (20:26 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9934 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/plugins/admin/groups/class_divListGroup.inc
gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
gosa-core/plugins/admin/users/class_divListUsers.inc

index fc5d5073aac639a3ecd3a20e1de448080143a993..9b9430f6cc7534474a52712d7b7ddb507ab128a9 100644 (file)
@@ -82,15 +82,15 @@ class divListGroup extends MultiSelectWindow
 
     /*                  Text        ,Value    ,Name         ,Is selected */
     $this->AddCheckBox("ShowPrimaryGroups",     _("Select to see groups that are primary groups of users"), 
-                                                  sprintf(_("Show %s groups"),_("primary")),     true);
+                                                  sprintf(_("Show %s"),_("primary groups")),     true);
     $this->AddCheckBox("ShowSambaGroups",       msgPool::selectToView(_("samba groups mappings"),"enabled"), 
-                                                  sprintf(_("Show %s groups"),_("samba")),              true);
+                                                  sprintf(_("Show %s"),_("samba groups")),              true);
     $this->AddCheckBox("ShowApplicationGroups", msgPool::selectToView(_("application settings"),"enabled"),     
-                                                  sprintf(_("Show %s groups"),_("application")),        true);
+                                                  sprintf(_("Show %s"),_("application groups")),        true);
     $this->AddCheckBox("ShowMailGroups",        msgPool::selectToView(_("mail settings"),"enabled"), 
-                                                  sprintf(_("Show %s groups"),_("mail")),               true);
+                                                  sprintf(_("Show %s"),_("mail groups")),               true);
     $this->AddCheckBox("ShowFunctionalGroups",  _("Select to see normal groups that have only functional aspects"),
-                                                  sprintf(_("Show %s groups"),_("functional")),     true);
+                                                  sprintf(_("Show %s"),_("functional groups")),     true);
     $this->AddCheckBox(SEPERATOR);
 
     /* Add SubSearch checkbox */    
index fd1280754c6e47b76282ed1a52b5d7535b1a637c..260bf3d6de00856708371ee5c0579808e5032b97 100644 (file)
@@ -85,35 +85,34 @@ class divListOGroup extends MultiSelectWindow
     $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
 
     /*                  Text        ,Value    ,Name         ,Is selected */
-    $str1 = _("Select to see groups containing '%s'.");
-    $str2 = _("Show groups containing '%s'");
-    $this->AddCheckBox("UserGroups" ,       sprintf($str1,  _("Users")), 
-                                            sprintf($str2,  _("Users")), true);
-    $this->AddCheckBox("GroupGroups" ,      sprintf($str1,  _("Groups")),
-                                            sprintf($str2,  _("Groups")), true);
-    $this->AddCheckBox("ApplicationGroups", sprintf($str1,  _("Applications")),
-                                            sprintf($str2,  _("Applications")), true);
-    $this->AddCheckBox("DepartmentGroups" , sprintf($str1,  _("Departments")),
-                                            sprintf($str2,  _("Departments")), true);
-    $this->AddCheckBox("ServerGroups" ,     sprintf($str1,  _("Server")),
-                                            sprintf($str2,  _("Server")), true);
-    $this->AddCheckBox("WorkstationGroups", sprintf($str1,  _("Workstations")),
-                                            sprintf($str2,  _("Workstations")), true);
-    $this->AddCheckBox("WindowsGroups",     sprintf($str1,  _("Windows workstations")),
-                                            sprintf($str2,  _("Windows workstations")), true);
-    $this->AddCheckBox("TerminalGroups" ,   sprintf($str1,  _("Terminals")),
-                                            sprintf($str2,  _("Terminals")), true);
-    $this->AddCheckBox("PrinterGroups" ,    sprintf($str1,  _("Printer")),
-                                            sprintf($str2,  _("Printer")), true);
-    $this->AddCheckBox("PhoneGroups" ,      sprintf($str1,  _("Phones")),
-                                            sprintf($str2,  _("Phones")), true);
+    $str2 = _("Show groups with '%s'");
+    $this->AddCheckBox("UserGroups" ,       sprintf($str2,  _("users")), 
+                                            sprintf($str2,  _("users")), true);
+    $this->AddCheckBox("GroupGroups" ,      sprintf($str2,  _("groups")),
+                                            sprintf($str2,  _("groups")), true);
+    $this->AddCheckBox("ApplicationGroups", sprintf($str2,  _("applications")),
+                                            sprintf($str2,  _("applications")), true);
+    $this->AddCheckBox("DepartmentGroups" , sprintf($str2,  _("departments")),
+                                            sprintf($str2,  _("departments")), true);
+    $this->AddCheckBox("ServerGroups" ,     sprintf($str2,  _("server")),
+                                            sprintf($str2,  _("server")), true);
+    $this->AddCheckBox("WorkstationGroups", sprintf($str2,  _("workstations")),
+                                            sprintf($str2,  _("workstations")), true);
+    $this->AddCheckBox("WindowsGroups",     sprintf($str2,  _("windows workstations")),
+                                            sprintf($str2,  _("windows workstations")), true);
+    $this->AddCheckBox("TerminalGroups" ,   sprintf($str2,  _("terminals")),
+                                            sprintf($str2,  _("terminals")), true);
+    $this->AddCheckBox("PrinterGroups" ,    sprintf($str2,  _("printers")),
+                                            sprintf($str2,  _("printers")), true);
+    $this->AddCheckBox("PhoneGroups" ,      sprintf($str2,  _("phones")),
+                                            sprintf($str2,  _("phones")), true);
 
     /* Add SubSearch checkbox */    
     $this->AddCheckBox(SEPERATOR);
     $this->AddCheckBox("SubSearch",  msgPool::selectToView("","subsearch"), msgPool::selectToView("","subsearch_small"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
-    $this->AddRegex   ("Regex",     _("Regular expression for matching group names"), "*" , true);
+    $this->AddRegex   ("Regex", _("Regular expression for matching group names"), "*" , true);
   }
 
 
index 9f2ab63337676aeb177ffce5ab0b5194b4e24e5f..eddb2bd024e8ff2a942eada5bb2a10293c4929a1 100644 (file)
@@ -82,11 +82,11 @@ class divListUsers extends MultiSelectWindow
     $this->AddHeader(array("string"=>_("Actions"),      "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
     
     $this->AddCheckBox("ShowTemplates"      ,msgPool::selectToView(_("Template"))             ,sprintf(_("Show %s"),_("templates")), false);
-    $this->AddCheckBox("ShowFunctionalUsers",msgPool::selectToView(_("GOsa object"),"enabled"),sprintf(_("Show %s user"),_("functional")), true);
-    $this->AddCheckBox("ShowUnixUsers"      ,msgPool::selectToView(_("Posix"),"enabled")      ,sprintf(_("Show %s user"),_("POSIX")), true);
-    $this->AddCheckBox("ShowMailUsers"      ,msgPool::selectToView(_("Mail"),"enabled")       ,sprintf(_("Show %s user"),_("mail")), true);
-    $this->AddCheckBox("ShowSambaUsers"     ,msgPool::selectToView(_("Samba"),"enabled")      ,sprintf(_("Show %s user"),_("samba")), true);
-    $this->AddCheckBox("ShowProxyUsers"     ,msgPool::selectToView(_("Proxy"),"enabled")      ,sprintf(_("Show %s user"),_("proxy")), true);
+    $this->AddCheckBox("ShowFunctionalUsers",msgPool::selectToView(_("GOsa object"),"enabled"),sprintf(_("Show %s"),_("functional users")), true);
+    $this->AddCheckBox("ShowUnixUsers"      ,msgPool::selectToView(_("Posix"),"enabled")      ,sprintf(_("Show %s"),_("POSIX users")), true);
+    $this->AddCheckBox("ShowMailUsers"      ,msgPool::selectToView(_("Mail"),"enabled")       ,sprintf(_("Show %s"),_("mail users")), true);
+    $this->AddCheckBox("ShowSambaUsers"     ,msgPool::selectToView(_("Samba"),"enabled")      ,sprintf(_("Show %s"),_("samba users")), true);
+    $this->AddCheckBox("ShowProxyUsers"     ,msgPool::selectToView(_("Proxy"),"enabled")      ,sprintf(_("Show %s"),_("proxy users")), true);
 
     /* Add SubSearch checkbox */
     $this->AddCheckBox(SEPERATOR);