From: cajus Date: Sun, 25 Apr 2010 17:51:24 +0000 (+0000) Subject: Updated strings X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e339cb2472f003494c8c99648e03dac80e95564;p=gosa.git Updated strings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17826 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc index ee47a29b8..8ef45f59a 100644 --- a/gosa-core/include/class_SnapShotDialog.inc +++ b/gosa-core/include/class_SnapShotDialog.inc @@ -90,7 +90,7 @@ class SnapShotDialog extends plugin if($found){ $this->del_dn = $entry; $smarty= get_smarty(); - $smarty->assign("info", sprintf(_("You're about to delete the snapshot '%s'."), LDAP::fix($this->del_dn))); + $smarty->assign("info", sprintf(_("You are about to delete the snapshot '%s'."), LDAP::fix($this->del_dn))); return($smarty->fetch (get_template_path('removeEntries.tpl'))); } } @@ -143,7 +143,7 @@ class SnapShotDialog extends plugin $data = $lData = array(); foreach($list_of_elements as $entry){ $actions= image('images/lists/restore.png','RestoreSnapShot_%KEY',_("Restore snapshot")); - $actions.= image('images/lists/trash.png','RemoveSnapShot_%KEY',_("Remove snapshot")); + $actions.= image('images/lists/trash.png','RemoveSnapShot_%KEY',_("Delete snapshot")); $time_stamp = date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0])); $display_data = $entry['description'][0]; $data[$entry['dn']] = $entry; diff --git a/gosa-core/include/class_SnapshotHandler.inc b/gosa-core/include/class_SnapshotHandler.inc index d371db5fc..7842e1b91 100644 --- a/gosa-core/include/class_SnapshotHandler.inc +++ b/gosa-core/include/class_SnapshotHandler.inc @@ -43,7 +43,7 @@ class SnapshotHandler { if(!session::is_set("snapshotFailMessageSend")){ session::set("snapshotFailMessageSend",TRUE); msg_dialog::display(_("Configuration error"), - sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."), + sprintf(_("The snapshot functionality is enabled but the required variable '%s' is not set!"), "snapshotBase"), ERROR_DIALOG); } return; @@ -56,7 +56,7 @@ class SnapshotHandler { if(!session::is_set("snapshotFailMessageSend")){ session::set("snapshotFailMessageSend",TRUE); msg_dialog::display(_("Configuration error"), - sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install '%s'."),"php5-zip / php5-gzip"), ERROR_DIALOG); + sprintf(_("The snapshot functionality is enabled but the required PHP compression module is missing: %s!"),"php5-zip / php5-gzip"), ERROR_DIALOG); } return; } @@ -74,7 +74,7 @@ class SnapshotHandler { if(!session::is_set("snapshotFailMessageSend")){ session::set("snapshotFailMessageSend",TRUE); msg_dialog::display(_("Configuration error"), - sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."), + sprintf(_("The snapshot functionality is enabled but the required variable '%s' is not set!"), $missing), ERROR_DIALOG); } return; diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc index 73d4784c7..853893edc 100644 --- a/gosa-core/include/class_acl.inc +++ b/gosa-core/include/class_acl.inc @@ -571,7 +571,7 @@ class acl extends plugin $summary= ''._("No ACL settings for this category!").''; } else { $summary= trim($summary,", "); - $summary= " ".sprintf(_("Contains ACLs for these objects: %s"), $summary); + $summary= " ".sprintf(_("ACLs for: %s"), $summary); } $actions =""; @@ -628,13 +628,12 @@ class acl extends plugin /* Role selector if scope is base */ if ($this->aclType == 'role'){ - $smarty->assign('roleSelector', "Role selector");#, $this->buildRoleSelector($this->myAclObjects)); $smarty->assign('roleSelector', $this->buildRoleSelector($this->roles)); } } if ($this->dialogState == 'edit'){ - $smarty->assign('headline', sprintf(_("Edit ACL for '%s' - scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType])); + $smarty->assign('headline', sprintf(_("Edit ACL for '%s' with scope '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType])); /* Collect objects for selected category */ foreach ($this->ocMapping[$this->aclObject] as $idx => $class){ @@ -1087,9 +1086,9 @@ class acl extends plugin if($entry['type'] == "role"){ if(isset($this->roles[$entry['acl']])){ - $summary.= sprintf(_("Role: %s"), $this->roles[$entry['acl']]['cn']); + $summary.= sprintf(_("ACL role: %s"), $this->roles[$entry['acl']]['cn']); }else{ - $summary.= sprintf(_("Role: %s"), ""._("unknown role").""); + $summary.= sprintf(_("ACL role: %s"), ""._("unknown ACL role").""); } }else{ foreach ($entry['acl'] as $name => $object){ @@ -1294,7 +1293,6 @@ class acl extends plugin "objectClass" => array("gosaAcl","gosaRole"))), "plProvidedAcls"=> array( "gosaAclEntry" => _("ACL Entries") -// "description" => _("Role description") ) )); diff --git a/gosa-core/include/class_certificate.inc b/gosa-core/include/class_certificate.inc index cd588c3bd..807930531 100644 --- a/gosa-core/include/class_certificate.inc +++ b/gosa-core/include/class_certificate.inc @@ -97,7 +97,7 @@ class certificate /* If cert is loaded correctly and is PEM now, we could read some data out of it */ if(count($this->info()) <=1) { $this->certificate(); - $this->error = _("Cannot load certificate - only PEM/DER is supported!"); + $this->error = _("Cannot load certificate: only PEM and DER are supported!"); /* Reset*/ return(false); } diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 64995adac..96a18940a 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -322,7 +322,7 @@ class config { /* Check for connection */ if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){ $smarty= get_smarty(); - msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP. Please contact the system administrator."), FATAL_ERROR_DIALOG); + msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP!"), FATAL_ERROR_DIALOG); exit(); } @@ -1109,7 +1109,7 @@ class config { /* Check contributed config version and current config version. */ if(($this->config_version == "NOT SET") || ($this->config_version != $current && !empty($this->config_version))){ - msg_dialog::display(_("Configuration"),_("The configuration file you are using seems to be outdated. Please move the GOsa configuration file away to run the GOsa setup again.")); + msg_dialog::display(_("Configuration"),_("The configuration file you are using is outdated. Please move the GOsa configuration file away to run the GOsa setup again.")); } } diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc index d75f800b4..3d6649cc7 100644 --- a/gosa-core/include/class_ldap.inc +++ b/gosa-core/include/class_ldap.inc @@ -230,7 +230,7 @@ class LDAP{ if($this->max_ldap_query_time){ $diff = microtime(true) - $start; if($diff > $this->max_ldap_query_time){ - msg_dialog::display(_("Performance warning"), sprintf(_("LDAP performance is poor: last query took about %.2fs!"), $diff), WARNING_DIALOG); + msg_dialog::display(_("Performance warning"), sprintf(_("LDAP performance is poor: last query took %.2fs!"), $diff), WARNING_DIALOG); } } @@ -263,7 +263,7 @@ class LDAP{ if($this->max_ldap_query_time){ $diff = microtime(true) - $start; if($diff > $this->max_ldap_query_time){ - msg_dialog::display(_("Performance warning"), sprintf(_("LDAP performance is poor: last query took about %.2fs!"), $diff), WARNING_DIALOG); + msg_dialog::display(_("Performance warning"), sprintf(_("LDAP performance is poor: last query took %.2fs!"), $diff), WARNING_DIALOG); } } @@ -690,7 +690,7 @@ class LDAP{ /* Bail out, if we've nothing to do... */ if ($ocname == ""){ - msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': no object class found!"),$type), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': no object class found"),$type), FATAL_ERROR_DIALOG); exit(); } @@ -828,9 +828,9 @@ class LDAP{ } else { $adderror= $this->get_additional_error(); if ($adderror != ""){ - $error= $this->error." (".$this->get_additional_error().", ".sprintf(_("while operating on '%s' using LDAP server '%s'"), $this->basedn, $this->hostname).")"; + $error= $this->error." (".$this->get_additional_error().", ".sprintf(_("while operating on %s using LDAP server %s"), "".$this->basedn."", "".$this->hostname."").")"; } else { - $error= $this->error." (".sprintf(_("while operating on LDAP server %s"), $this->hostname).")"; + $error= $this->error." (".sprintf(_("while operating on LDAP server %s"), "".$this->hostname."").")"; } return $error; } @@ -1052,7 +1052,7 @@ class LDAP{ /* Every block must begin with a dn */ if($dn != "dn") { - $error= sprintf(_("This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' in line %s"), $line, $current_line); + $error= sprintf(_("Invalid DN '%s': block to be imported should start with 'dn: ...' in line %s"), $line, "".$current_line.""); return -2; } @@ -1081,7 +1081,7 @@ class LDAP{ /* If we can't Import, return with a file error */ if(!$this->import_single_entry($srp, $single,$usemodify,$usermdir) ) { - $error= sprintf(_("Error while importing dn: '%s', please check your LDIF from line %s on!"), $line, + $error= sprintf(_("Error while importing DN '%s': please check LDIF from line %s on!"), $line, $current_line); return UNKNOWN_TOKEN_IN_LDIF_FILE; } } diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index c636d7f5b..9f5c8c6b9 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -245,7 +245,7 @@ class listing { isset($config['sortType'])) { $this->sortAttribute= $config['sortAttribute']; $this->sortType= $config['sortType']; - $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top"); + $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Sort ascending"):_("Sort descending"), "text-top"); } $sortable= (isset($config['sortAttribute'])); @@ -1025,17 +1025,17 @@ class listing { /* Draw back button */ if($enableBack){ - $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go up one department")); + $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go to preceding level")); }else{ - $result["BACK"]= image('images/lists/back-grey.png', null, _("Go up one department")); + $result["BACK"]= image('images/lists/back-grey.png', null, _("Go to preceding level")); } /* Draw home button */ /* Draw home button */ if($enableHome){ - $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to users department")); + $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to current users level")); }else{ - $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to users department")); + $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to current users level")); } @@ -1550,7 +1550,7 @@ class listing { // Draw snapshot button if($ui->allow_snapshot_create($dn, $category)){ - $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create a new snapshot from this object")); + $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create new snapshot for this object")); }else{ $result.= image('images/empty.png'); } diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc index ebaeff5a6..fad74e450 100644 --- a/gosa-core/include/class_log.inc +++ b/gosa-core/include/class_log.inc @@ -103,7 +103,7 @@ class log { } if(!isset($entry['objecttype']) || empty($entry['objecttype'])){ - $msgs[] = _("Specified objectType is empty or invalid!"); + $msgs[] = _("Specified 'objectType' is empty or invalid!"); } return($msgs); diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index e7f93e01a..6915a6e0d 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -457,7 +457,7 @@ class management $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s."),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"),$entry), ERROR_DIALOG); } } @@ -504,7 +504,7 @@ class management @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Snaptshot restored!"); $this->closeDialogs(); }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), ERROR_DIALOG); } } @@ -541,7 +541,7 @@ class management $this->dialogObject->display_restore_dialog = true; $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), ERROR_DIALOG); } }else{ @@ -555,7 +555,7 @@ class management $this->dialogObject->display_restore_dialog = true; $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), ERROR_DIALOG); } } @@ -614,7 +614,7 @@ class management $this->tabObject->parent = &$this; @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!"); } else { - msg_dialog::display(_("Error"), sprintf(_("No tab declaration for '%s' found in your configuration file. Cannot create plugin instance!"), $tabType), ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("No tab definition for '%s' found in configuration file: cannot create plugin instance!"), $tabType), ERROR_DIALOG); } } } diff --git a/gosa-core/include/class_multi_plug.inc b/gosa-core/include/class_multi_plug.inc index af39e67d7..a6cbc9410 100644 --- a/gosa-core/include/class_multi_plug.inc +++ b/gosa-core/include/class_multi_plug.inc @@ -388,7 +388,7 @@ class multi_plug { foreach($this->a_handles as $i_id => $o_handle){ if($o_handle->password_change_needed() && isset($o_handle->by_object['user'])){ - new msg_dialog(_("Password reset"),_("The user password was resetted, please set a new password value!"),WARNING_DIALOG); + new msg_dialog(_("Reset password"),_("The user password has been reset. Please set a new password!"),WARNING_DIALOG); change_password ($o_handle->dn, "",0, $o_handle->by_object['user']->pw_storage); } } diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index 5af565229..267e22c9e 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -524,7 +524,7 @@ class plugin $current_csn = getEntryCSN($this->dn); if($current_csn != $this->entryCSN && !empty($this->entryCSN) && !empty($current_csn)){ $this->entryCSN = $current_csn; - $message[] = _("The object has changed since opened in GOsa. All changes that may be done by others get lost if you save this entry!"); + $message[] = _("The current object has been altered while beeing edited. If you save this entry, changes that have been made by others will be discarded!"); } } return ($message); @@ -842,8 +842,7 @@ class plugin $ldap->cd($this->config->current['BASE']); $ldap->create_missing_trees(preg_replace("/^[^,]+,/","",$dst_dn)); if (!$ldap->rename_dn($src_dn,$dst_dn)){ -# msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class())); - new log("debug","Ldap Protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn -- TO: $dst_dn",array(),$ldap->get_error()); + new log("debug","LDAP protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn -- TO: $dst_dn",array(),$ldap->get_error()); @DEBUG(DEBUG_LDAP,__LINE__,__FUNCTION__,__FILE__,"Rename failed FROM: $src_dn -- TO: $dst_dn", "Ldap Protocol v3 implementation error, falling back to maunal method."); return(FALSE); @@ -1431,7 +1430,7 @@ class plugin if(!empty($entry) && $ui->allow_snapshot_create($entry,$this->parent->acl_module)){ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s."),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"),$entry),ERROR_DIALOG); } } @@ -1443,7 +1442,7 @@ class plugin $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); $this->snapDialog->display_restore_dialog = true; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),ERROR_DIALOG); } } @@ -1458,7 +1457,7 @@ class plugin $this->snapDialog->display_restore_dialog = true; $this->snapDialog->display_all_removed_objects = true; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$base),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$base),ERROR_DIALOG); } } @@ -1471,7 +1470,7 @@ class plugin $this->restore_snapshot($entry); $this->snapDialog = NULL; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),ERROR_DIALOG); } } } @@ -1687,8 +1686,7 @@ class plugin /* Acls for this object must be adjusted */ if($found){ - $debug_info= _("Changing ACL dn")." : 
 -"._("from")."  ". - $old_dn."
 -"._("to")." ".$new_dn."
"; + $debug_info= sprintf(_("Changing ACL DN from %s to %s"), "".$old_dn."", "".$new_dn.""); @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,$debug_info,"ACL"); $update[$attrs['dn']] =array(); @@ -1897,7 +1895,7 @@ class plugin if($ui->allow_snapshot_create($base,$category)){ $str.= " "; + title='"._("Create new snapshot for this object")."'> "; }else{ $str = "  "; } @@ -1915,7 +1913,7 @@ class plugin if($cut){ if($ui->is_cutable($base,$category,$class)){ $action .= " "; + src='images/lists/cut.png' alt='"._("Cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; }else{ $action.="  "; } @@ -1923,7 +1921,7 @@ class plugin if($copy){ if($ui->is_copyable($base,$category,$class)){ $action.= " "; + src='images/lists/copy.png' alt='"._("Copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> "; }else{ $action.="  "; } diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index cd8ad201b..ee593b34b 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -96,7 +96,7 @@ class pluglist if (!isset($plug['CLASS'])){ msg_dialog::display( _("Configuration error"), - _("The configuration format has changed. Please re-run setup!"), + _("The configuration format has changed: please run the setup again!"), FATAL_ERROR_DIALOG); exit(); } @@ -226,7 +226,7 @@ class pluglist $this->menu .= "\n \n"; diff --git a/gosa-core/include/class_session.inc b/gosa-core/include/class_session.inc index 9d298cd9e..7d8524c73 100644 --- a/gosa-core/include/class_session.inc +++ b/gosa-core/include/class_session.inc @@ -73,7 +73,7 @@ class session { /* Sanity check */ if (!session::channel_exists($channel)){ - msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), _("Requested channel does not exist!"), FATAL_ERROR_DIALOG); } $channel= "gch_".$channel; @@ -98,7 +98,7 @@ class session { } else { /* Sanity check */ if (!session::channel_exists($channel)){ - msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), _("Requested channel does not exist!"), FATAL_ERROR_DIALOG); } $_SESSION[$channel][$name] = $value; } @@ -124,7 +124,7 @@ class session { /* Sanity check */ if (!session::channel_exists($channel)){ - msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), _("Requested channel does not exist!"), FATAL_ERROR_DIALOG); } $channel= "gch_".$channel; diff --git a/gosa-core/include/class_socketClient.inc b/gosa-core/include/class_socketClient.inc index 4442e1c50..919e6e037 100644 --- a/gosa-core/include/class_socketClient.inc +++ b/gosa-core/include/class_socketClient.inc @@ -57,7 +57,7 @@ class Socket_Client public function setEncryptionKey($key) { if(!function_exists("mcrypt_get_iv_size")){ - $this->set_error(_("The mcrypt module was not found. Please install php5-mcrypt.")); + $this->set_error(_("No PHP mcrypt module found!")); $this->ckey = ""; $this->b_encrypt = FALSE; } @@ -105,7 +105,7 @@ class Socket_Client $this->handle = @fsockopen($this->host, $this->port, $this->errno, $this->errstr, $this->timeout); if(!$this->handle){ $this->handle = NULL; - $this->set_error(sprintf(_("Socket connection to host '%s:%s' failed: %s"),$this->host,$this->port,$this->errstr)); + $this->set_error(sprintf(_("Socket connection to '%s:%s' failed: %s"),$this->host,$this->port,$this->errstr)); }else{ $this->b_data_send = TRUE; @@ -188,7 +188,7 @@ class Socket_Client } } if((microtime(TRUE) - $start) > $this->timeout ){ - $this->set_error(sprintf(_("Socket timeout of %s seconds reached."),$this->timeout)); + $this->set_error(sprintf(_("Socket timeout of %s seconds reached!"),$this->timeout)); break; } } diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc index 3c8ad5917..4642d086c 100644 --- a/gosa-core/include/class_sortableListing.inc +++ b/gosa-core/include/class_sortableListing.inc @@ -258,7 +258,7 @@ class sortableListing { $link= "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'"; $sorter= ""; if ($i == $this->sortColumn){ - $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Up"):_("Down")); + $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Sort ascending"):_("Sort descending")); } if ($this->reorderable) { diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc index ccc3f7c71..ac772eeef 100644 --- a/gosa-core/include/class_tabs.inc +++ b/gosa-core/include/class_tabs.inc @@ -54,7 +54,7 @@ class tabs if(!count($data)) { $data[] = array("CLASS" => 'plugin',"NAME" => 'Error'); msg_dialog::display(_("Error"), - sprintf(_("No plugin definitions found to initialize '%s', please check your configuration file."),get_class($this)), + sprintf(_("No plugin definition for '%s' found: please check the configuration file!"),get_class($this)), "ERROR_DIALOG"); } diff --git a/gosa-core/include/class_userFilterEditor.inc b/gosa-core/include/class_userFilterEditor.inc index b4caa39d4..00f34f9cf 100644 --- a/gosa-core/include/class_userFilterEditor.inc +++ b/gosa-core/include/class_userFilterEditor.inc @@ -248,7 +248,7 @@ class userFilterEditor extends plugin $o = substr_count($f, '('); $c = substr_count($f, ')'); if($o != $c){ - $msgs[] = sprintf(_("Please check your filter #%s. You have '%s' opening and '%s' closing brackets!"), ($key+1),$o, $c); + $msgs[] = sprintf(_("Error in filter #%s: %s opening and %s closing brackets detected!"), ($key+1),$o, $c); } }