From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Apr 2010 21:48:06 +0000 (+0000)
Subject: Updated strings
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14e23387e41eb877719e614166d7f135aa162987;p=gosa.git

Updated strings


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17919 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index b4bf4cf7e..44b505d99 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -270,7 +270,7 @@ class user extends plugin
         $attrs = $ldap->fetch();
         $this->manager_name = $attrs['cn'][0];
       }else{
-        $this->manager_name = "("._("Unknown")."!): ".$this->manager;
+        $this->manager_name = "("._("unknown")."!): ".$this->manager;
       }
     }
   }
@@ -565,7 +565,7 @@ class user extends plugin
           /* Additional info if start end time is '0' */
           $add_str_info = "";
           if($timeto == 0 && $timefrom == 0){
-            $add_str_info = "<br><i>"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.)")."</i>";
+            $add_str_info = "<br>".bold(_("(Not supported certificate types are marked as invalid.)"));
           }
 
           $str = "<table \"\" border=0 summary='"._("Certificates")."'>
@@ -576,10 +576,10 @@ class user extends plugin
                   </table><br>".
 
                   sprintf(_("Certificate is valid from %s to %s and is currently %s."),
-                        "<b>".date('d M Y',$timefrom)."</b>",
-                        "<b>".date('d M Y',$timeto)."</b>",
-                        $certificate->isvalid()?"<b><font style='color:green'>"._("valid")."</font></b>":
-                                                "<b><font style='color:red'>"._("invalid")."</font></b>").$add_str_info;
+                        bold(date('d M Y',$timefrom)),
+                        bold(date('d M Y',$timeto)),
+                        $certificate->isvalid()?bold("<span style='color:green'>"._("valid")."</span>"):
+                                                bold("<span style='color:red'>"._("invalid")."</span>")).$add_str_info;
 
           $smarty->assign($cert."info",$str);
           $smarty->assign($cert."_state","true");
@@ -1691,9 +1691,9 @@ class user extends plugin
 
           "sn"                => _("Surname"),
           "givenName"         => _("Given name"),
-          "uid"               => _("User identification"),
+          "uid"               => _("Login"),
 
-          "gosaUserDefinedFilter"  => _("Allow to define user filters"),
+          "gosaUserDefinedFilter"  => _("Allow definition of custom filters"),
 
           "personalTitle"     => _("Personal title"),
           "academicTitle"     => _("Academic title"),
@@ -1885,7 +1885,7 @@ class user extends plugin
         $attrs = $ldap->fetch();
         $this->manager_name = $attrs['cn'][0];
       }else{
-        $this->manager_name = "("._("Unknown")."!): ".$this->manager;
+        $this->manager_name = "("._("unknown")."!): ".$this->manager;
       }
     }
 
diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl
index 4af940b0e..a78630dab 100644
--- a/gosa-core/plugins/personal/generic/generic_picture.tpl
+++ b/gosa-core/plugins/personal/generic/generic_picture.tpl
@@ -1,4 +1,4 @@
-<h3>{t}Personal picture{/t}</h3>
+<h3>{t}User picture{/t}</h3>
 <table summary="{t}The users picture{/t}">
  <tr>
   <td style='width:147px; height:200px; background-color:gray;'>