From 2aeab3942abfef8c64c1377992d73082227be400 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 14 Sep 2007 12:55:17 +0000 Subject: [PATCH] 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 --- include/functions.inc | 17 +++++++++++++++-- plugins/addons/ldapmanager/main.inc | 2 +- plugins/admin/systems/class_divListSystem.inc | 2 +- plugins/admin/systems/class_phoneGeneric.inc | 4 ++-- plugins/admin/systems/class_printGeneric.inc | 6 +++--- .../admin/systems/class_printerPPDDialog.inc | 2 +- plugins/admin/systems/class_servKolab.inc | 2 +- .../admin/systems/class_systemManagement.inc | 2 +- plugins/admin/systems/class_termDNS.inc | 2 +- plugins/gofax/faxaccount/class_gofaxAccount.inc | 3 ++- plugins/personal/generic/class_user.inc | 2 +- 11 files changed, 29 insertions(+), 15 deletions(-) diff --git a/include/functions.inc b/include/functions.inc index cae474cb8..9b3b46060 100644 --- 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 9c529f2a2..75496f273 100644 --- 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 f65a79c4d..33985e164 100644 --- 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 = ""; + $action2 = ""; }else{ $action2 = ""; } diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 5faf9ce2b..33388787b 100644 --- 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 12b80670e..92290222d 100644 --- 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 f30c50e5f..e7073aa16 100644 --- 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 b5798580c..1e60f7d9a 100644 --- 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 27a4e6e0f..3ccb872a2 100644 --- 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 693ad6f44..065a6e112 100644 --- 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 ed66cd3b6..42ab729ce 100644 --- 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 edf9a4701..8e1fdc026 100644 --- 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 */ -- 2.30.2