From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 15 Sep 2010 09:07:59 +0000 (+0000)
Subject: Updated strings
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c9fd8a78d55e6bb1261becf7465b5abe7d6c1a25;p=gosa.git

Updated strings


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

diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index 67f307380..4fee912c3 100644
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -728,48 +728,44 @@ class groupware extends plugin
         //required vacationEnabled
         if($this->vacationEnabled){
             if(!tests::is_date($this->vacationStart)){
-                $messages[] = msgPool::invalid(_("Vacation start date"),$this->vacationStart , "", _("Example of date : 01.03.2010"));
+                $messages[] = msgPool::invalid(_("Vacation start date"),$this->vacationStart , "", "01.03.2010");
             }
             if(!tests::is_date($this->vacationStop)){
-                $messages[] = msgPool::invalid(_("Vacation stop date"),$this->vacationStop , "", _("Example of date : 01.03.2010"));
+                $messages[] = msgPool::invalid(_("Vacation stop date"),$this->vacationStop , "", "01.03.2010");
             }
             $diff = tests::compareDate($this->vacationStart, $this->vacationStop);
 
             if($diff>=0){
-                $messages[] = msgPool::invalid(_("Vacation dates"), $this->vacationStart." - ".$this->vacationStop, "", _("Enddate before Start or the same."));
+                $messages[] = msgPool::invalid(_("Vacation dates"));
             }
         }
         if(!tests::is_email ($this->mailAddress)){
-            $messages[] = msgPool::invalid(_("Mail address"),$this->mailAddress , "", _("Example: user@excom.intranet.gonicus.de"));
+            $messages[] = msgPool::invalid(_("Mail address"),$this->mailAddress , "", "user@excom.intranet.gonicus.de");
         }
 
         if(isset($this->forwardingAddresses) && is_array($this->forwardingAddresses)){
             foreach($this->forwardingAddresses as $fAddress){
                 if(!tests::is_email ($fAddress)){
-                    $messages[] = msgPool::invalid(_("Mail address"),$fAddress, "", 
-                            _("Example: user@excom.intranet.gonicus.de"));
+                    $messages[] = msgPool::invalid(_("Alternate address"),$fAddress, "", 
+                            "user@excom.intranet.gonicus.de");
                 }
                 if($fAddress == $this->mailAddress){
-                    $messages[] = msgPool::invalid(_("Mail address same as primary Email Address"),$fAddress, "",
-                            _("Forward Address and primary Email Address must not be the same (cirle reference)"));
+                    $messages[] = _("The primary address cannot be used as alternative address!");
                 }
             }
         }
         if(isset($this->alternateAddresses) && is_array($this->alternateAddresses)){
             foreach($this->alternateAddresses as $fAddress){
                 if(!tests::is_email ($fAddress)){
-                    $messages[] = msgPool::invalid(_("Mail address"),$fAddress, "", _("Example: user@excom.intranet.gonicus.de"));
+                    $messages[] = msgPool::invalid(_("Forward address"),$fAddress, "", "user@excom.intranet.gonicus.de");
                 }
                 if($fAddress == $this->mailAddress){
-                    $messages[] = msgPool::invalid(_("Mail address same as primary Email Address"),$fAddress, "",
-                            _("Alternative Address and primary Email Address must not be the same (cirle reference)"));
+                    $messages[] = _("The primary address cannot be used as forward address!");
                 }
             }
         }
-        /*
-         * TODO: Checks for quota and Locations?
-         */
-
+        
+        // TODO: Checks for quota and Locations?
         return($messages);
     }