Fixed english texts

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

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 0200bd5abb9222d6eeafab55cacc123efeeb6f57..d93f5b7138a35888d7980ea9dd529c5e3b61635e 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -380,8 +380,8 @@ function perform_additional_function_checks(&$faults) {
   /* Only print message, if function is not callable */
   foreach($functions as $key => $fn_name) {
     if(!is_callable($fn_name)) {
-      $msg.= check ($faults, sprintf(_("Checking for function <b>%s</b>"), get_link($fn_name)),
-        sprintf(_("The function <b>%s</b> is used by GOsa. There is no information if it's optional or required yet."),get_link($fn_name)),
+      $msg.= check ($faults, sprintf(_("Checking for function %s"), "<b>".get_link($fn_name)."</b>"),
+        sprintf(_("The function %s is used by GOsa. There is no information if it's optional or required yet."), "<b>".get_link($fn_name)."</b>"),
         is_callable($fn_name), false);
     }
   }

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 082e828c234647dc1b0d7ab7fd62aed440039dd6..1cc532880f32b5ff74079c3a54b39165e6faf9d5 100644 (file)
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/addons/addressbook/class_addressbook.inc
@@ -466,11 +466,11 @@ $this->telephone_list[$attrs['sn'][0].$attrs['dn']]=
                        $storage= _("global addressbook");
                        $smarty->assign("internal", 0);
                } else {
-                       $storage= _("organizations user database");
+                       $storage= _("user database");
                        $smarty->assign("internal", 1);
                }
                if ($_SESSION['show_info'] != "ADD"){
-                       $smarty->assign("storage_info", sprintf(_("Contact stored in %s"), $storage));
+                       $smarty->assign("storage_info", sprintf(_("Contact stored in '%s'"), $storage));
                } else {
                        $smarty->assign("storage_info", _("Creating new entry in"));
                }

diff --git a/plugins/admin/fai/askClassName.tpl b/plugins/admin/fai/askClassName.tpl
index 153e253714efe2cdf30c983c11f1394ea8735c8a..729492a9a28073105f645c687d02932b1a6743a6 100644 (file)
--- a/plugins/admin/fai/askClassName.tpl
+++ b/plugins/admin/fai/askClassName.tpl
@@ -71,7 +71,7 @@
                </td>
        </tr>
        <tr>
-               <td><b>{t}A new class name.</b>{/t}
+               <td><b>{t}A new class name.{/t}</b>
                </td>
                <td>
                <input type="submit" name="UseNewClass" value="{t}Use{/t}"> 

diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc
index 160047b5dd2efd42b8c1cfaa3f947e1cadae0c1a..21c824033fffa76b7ab8d6f9f2f05007b8536dab 100644 (file)
--- a/plugins/admin/fai/class_faiTemplateEntry.inc
+++ b/plugins/admin/fai/class_faiTemplateEntry.inc
@@ -165,14 +165,14 @@ class faiTemplateEntry extends plugin
       $message[] = _("Please enter a user.");
     }
     elseif(preg_match("/[^0-9a-z]/i",$this->user)){
-      $message[] = _("Please enter a valid user. Only a-Z 0-9 are allowed.");
+      $message[] = _("Please enter a valid user. Only a-z/0-9 are allowed.");
     }
 
     if(empty($this->group)){
       $message[] = _("Please enter a group.");
     }
     elseif(preg_match("/[^0-9a-z]/i",$this->group)){
-      $message[] = _("Please enter a valid group. Only a-Z 0-9 are allowed.");
+      $message[] = _("Please enter a valid group. Only a-z/0-9 are allowed.");
     }
 
     return ($message);

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index e0defdecf061ea02bc5c6eba9bc73337f508b889..da087b6efd9235da7752b7020fdae7713624a92f 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -222,7 +222,7 @@ class phonequeue extends plugin
     $SQL = array();
 
     if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
-      return(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database."));
+      return(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer). Your settings can't be saved to asterisk database."));
       return(false);
     }
 
@@ -236,7 +236,7 @@ class phonequeue extends plugin
     // Check if we are  connected correctly
     if(!$r_con){
       gosa_log(mysql_error());
-      return (sprintf(_("The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
+      return (sprintf(_("The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
           $a_SETUP['SERVER'],$a_SETUP['LOGIN']));
     }
 

diff --git a/plugins/generic/welcome/welcome.tpl b/plugins/generic/welcome/welcome.tpl
index d43c9d7452237931ab24925c02d85d7bf8b16dec..896372ae292989bc91768ff1e8debf5cd359c6f5 100644 (file)
--- a/plugins/generic/welcome/welcome.tpl
+++ b/plugins/generic/welcome/welcome.tpl
@@ -5,7 +5,7 @@
 </p>
 
 <p>
-  {t}Use <b>Sign out</b> on the upper left to close the connection and <b>Main</b> to get back to the pictogram view.{/t}
+  {t}Use 'Sign out' on the upper left to close the connection and 'Main' to get back to the pictogram view.{/t}
 </p>
  
 {$iconmenu}

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index b9e63ae2def028050a9975064161a7cf5583fdee..84d277ebe0173eb6d559f32dee5e9f5c40b8e65d 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -219,7 +219,7 @@ class conference extends plugin
   function SQL_add_me($save){
 
     if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
-      $this->generate_error = _("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database.");
+      $this->generate_error = _("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer). Your settings can't be saved to asterisk database.");
       return(false);
     }
   
@@ -231,7 +231,7 @@ class conference extends plugin
 
     // Check if we are  connected correctly
     if(!$r_con){
-      $this->generate_error = sprintf(_("The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
+      $this->generate_error = sprintf(_("The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
           $a_SETUP['SERVER'],$a_SETUP['LOGIN']);
       gosa_log(mysql_error());
       return false;

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 1beabc7b6db9bcd80d12d849b618c27af0ddd740..2341d4c9b20b2cd342481ebf3e6eaf2b4ef2f51c 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -85,7 +85,7 @@ class macro extends plugin
     $number = 0; 
 
     if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
-      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database."));
+      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer). Your settings can't be saved to asterisk database."));
     }
 
     /* Do we represent a valid group? */

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index ca5b6d0c9ca287673e144292b0cf303c50b94620..58bb3927fb98b814b35f1223ad7f05508949be5b 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -241,7 +241,7 @@ class phoneAccount extends plugin
   function generate_mysql_entension_entries($save = false){
 
     if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
-      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database."));
+      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer). Your settings can't be saved to asterisk database."));
       return(true);
     }
 
@@ -626,7 +626,7 @@ class phoneAccount extends plugin
 
     /* check if there is a FON server created */
     if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
-      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database."));
+      print_red(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer). Your settings can't be saved to asterisk database."));
     }
 
     /* Create parameter table, skip if no parameters given */