Updated translation, fixed some typo/errors

Fixed language translations

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

diff --git a/include/functions.inc b/include/functions.inc
index cae474cb80a6e95ba647eb7f2747d790b1400ac9..9b3b4606062fe44eeb8a71f0331516789d854948 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2522,17 +2522,30 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
         "sv_SE" => "Swedish",
         "zh_CN" => "Chinese",
         "ru_RU" => "Russian");
+  
+  $tmp2= array(
+        "de_DE" => _("German"),
+        "fr_FR" => _("French"),
+        "it_IT" => _("Italian"),
+        "es_ES" => _("Spanish"),
+        "en_US" => _("English"),
+        "nl_NL" => _("Dutch"),
+        "pl_PL" => _("Polish"),
+        "sv_SE" => _("Swedish"),
+        "zh_CN" => _("Chinese"),
+        "ru_RU" => _("Russian"));
 
   $ret = array();
   if($languages_in_own_language){
+
     $old_lang = setlocale(LC_ALL, 0);
     foreach($tmp as $key => $name){
       $lang = $key.".UTF-8";
       setlocale(LC_ALL, $lang);
       if($strip_region_tag){
-        $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$name.")";
+        $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$tmp2[$key].")";
       }else{
-        $ret[$key] = _($name)."  (".$name.")";
+        $ret[$key] = _($name)."  (".$tmp2[$key].")";
       }
     }
     setlocale(LC_ALL, $old_lang);

diff --git a/plugins/addons/ldapmanager/main.inc b/plugins/addons/ldapmanager/main.inc
index 9c529f2a286dab711dd6e0f20e12786d77eac9a8..75496f273da4744606e430f9d543a41d322cc725 100644 (file)
--- a/plugins/addons/ldapmanager/main.inc
+++ b/plugins/addons/ldapmanager/main.inc
@@ -25,7 +25,7 @@ if (!$remove_lock){
        }
        $ldif= $_SESSION['ldif'];
 
-       #print_red(_("Warning: Please check the SIZELIMIT option set on your LDAP server. You may not get all entries, if this value is to low!"));
+       #print_red(_("Warning: Please check the SIZELIMIT option set on your LDAP server. You may not get all entries, if this value is too low!"));
 
     /* set permissions */
     $acl= get_permissions ($ui->dn, $ui->subtreeACL);

diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index f65a79c4d53eb739e131ae539e6d6415ec6669d9..33985e164afae8fede1086f45413dc36e9f7077b 100644 (file)
--- a/plugins/admin/systems/class_divListSystem.inc
+++ b/plugins/admin/systems/class_divListSystem.inc
@@ -181,7 +181,7 @@ class divListSystem extends MultiSelectWindow
       }
 
       if(((in_array("gotoTerminal",$val['objectClass']))||(in_array("gotoWorkstation",$val['objectClass']))) && chkacl($acl,"password") == ""){
-        $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."'   name='user_setpwd_%KEY%' title='"._("Set root       password")."'>";
+        $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."'   name='user_setpwd_%KEY%' title='"._("Set root password")."'>";
       }else{
         $action2 = "";
       }

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 5faf9ce2ba038d2617332b733c35eeb207d2ac79..33388787b8305f5c3b945b43bb3fbd10777cf728 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -220,7 +220,7 @@ class phoneGeneric extends plugin
     $smarty->assign("base_select", $this->base);
     $smarty->assign("baseACL", chkacl($this->acl,"base"));
    
-    $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
+    $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Network settings")));
     $this->netConfigDNS->cn= $this->cn;
     $smarty->assign("netconfig", $this->netConfigDNS->execute());
 
@@ -245,7 +245,7 @@ class phoneGeneric extends plugin
 
     $ldap->search ("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))", array("uid","cn"));
     while ($attr =  $ldap->fetch()){
-      print_red(sprintf(_("Can't delete because there are user which are depending on this phone. One of them is user '%s'."),
+      print_red(sprintf(_("Can't delete because there are users which are depending on this phone. One of them is user '%s'."),
         ($attr['uid'][0]." - ".$attr['cn'][0])));
       return;
     }

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 12b80670eaf80058aeb026814318fb5ff09c6023..92290222dc53fd2bdf02bd8dec5a04789f7a6f82 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -249,7 +249,7 @@ class printgeneric extends plugin
      */
     if($this->BelongsTo == "unknown"){
       $display= $this->show_header(_("Add printer extension"),
-          _("Could not intialize printer tab, parameter parent was missing while construction."),TRUE,TRUE);
+          _("Could not initialize printer tab, parameter parent was missing while construction."),TRUE,TRUE);
       return($display);
     }
 
@@ -499,10 +499,10 @@ class printgeneric extends plugin
           $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
         }
       }else{
-        $smarty->assign("driverInfo", _("not defined"));
+        $smarty->assign("driverInfo", _("Not defined"));
       }
     }else{
-      $smarty->assign("driverInfo",_("can't get ppd informations."));
+      $smarty->assign("driverInfo",_("Can't get ppd informations."));
     }
 
     /* Create user & admin user list */

diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc
index f30c50e5f4e3dbdd8fa912d81be6405c81f7e219..e7073aa16e247f6144b4f24fd2df66a8d5a79d7c 100644 (file)
--- a/plugins/admin/systems/class_printerPPDDialog.inc
+++ b/plugins/admin/systems/class_printerPPDDialog.inc
@@ -245,7 +245,7 @@ class printerPPDDialog extends plugin
 
     /* Check if parse was successfull */
     if(empty($name) || empty($vendor)){
-      print_red(sprintf(_("The given ppd file '%s' seams to be invalid, can't get any modell or vendor informations."),$_PathOnHdd));
+      print_red(sprintf(_("The given ppd file '%s' seams to be invalid, can't get any model or vendor informations."),$_PathOnHdd));
       return(false);
     }
 

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index b5798580c44703b87be769cfde4f2a72530585ba..1e60f7d9a6cdcbcaf2682ef99c0f8d7ff1dc44e2 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -177,7 +177,7 @@ class servkolab extends plugin {
       return;
     }
 
-    /* Integration check, not translatet because they can't pop up at all, only for debug */ 
+    /* Integration check, not translated because they can't pop up at all, only for debug */ 
     if(count($this->kolabHost) == 0){
       print_red("Server - Kolab tab : This is not possible, we can't remove an account which doesn't exists.");
       return;

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 27a4e6e0f7686aa3b20d9ce46996a0ce0e5543eb..3ccb872a2b3555b1890b1bc7fd8bb256eaea58d1 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -497,7 +497,7 @@ class systems extends plugin
           }
         }   
         if(!$found){
-          print_red(sprintf(_("Can't set gotoMode to status 'avtice', the current object couldn't be identified.")));
+          print_red(sprintf(_("Can't set gotoMode to status 'active', the current object couldn't be identified.")));
         }
 
       }

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index 693ad6f444f064b007bc581dee55387351ec30bd..065a6e1129204b5aab84c4447748bf8400edd2cb 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -417,7 +417,7 @@ class termDNS extends plugin
     $message= plugin::check();
 
     if($this->dhcpEnabled && $this->dhcp_is_Account && $this->dhcpParentNode != "" && count($this->dhcpHostEntry) == 0){
-      $message[] =_("You haven not configured your dhcp settings yet.");
+      $message[] =_("You have not configured your dhcp settings yet.");
     }
 
     /* Check if ip must be given

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index ed66cd3b646955765b7dcdc79f027826342ff9e6..42ab729cecd4b5f0765cdff8aa5efdd74e300ad2 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -572,7 +572,8 @@ class gofaxAccount extends plugin
 
 
     /* Show main page */
-    $smarty->assign("languages", get_languages());
+    $smarty->assign("languages", get_languages(TRUE));
+
     $smarty->assign("formats", $this->config->data['MAIN']['FAXFORMATS']);
     $smarty->assign("printers", $this->printerList);
 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index edf9a4701c33d1a5a932c07a591bcdfcd8d68e02..8e1fdc0264e4026fe7803f24146658ae1267eca5 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -263,7 +263,7 @@ class user extends plugin
     /* Assign prefered langage */
 
     
-    $language= array_merge(array(0 => " ") ,get_languages());
+    $language= array_merge(array(0 => " ") ,get_languages(TRUE));
     $smarty->assign("preferredLanguage_list", $language);
 
     /* Get random number for pictures */