translation update

This commit is contained in:
Roland Gruber 2004-11-06 13:05:34 +00:00
parent b7dd7e9a35
commit 3382811d84
11 changed files with 614 additions and 627 deletions

View File

@ -63,9 +63,6 @@ class baseModule {
/** contains all error messages of a module */
var $messages;
/** contains syntax of all */
var $syntax;
/**
* Creates a new base module class
*
@ -541,7 +538,7 @@ class baseModule {
$temp = str_replace($index[$k], $convert[$index[$k]], $this->attributes[$attributes[$i]][$j]);
if ($temp!=$this->attributes[$attributes[$i]][$j]) {
$this->attributes[$attributes[$i]][$j] = $temp;
$messages[$attributes[$i]][] = array('WARN', _($attributes[$i]), _('Changed value s because only US-ASCII allowed.')); //, array($attributes[$i]));
$messages[$attributes[$i]][] = array('WARN', _($attributes[$i]), _('Changed value because only ASCII characters are allowed.'));
}
}
}

View File

@ -70,7 +70,7 @@ class cache {
$this->refresh_cache();
// Check input variables
$allowed_types = array ( 'user', 'group', 'host', 'domain', '*' );
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf(_('Invalid scope. Valid scopes are %s.'), implode(" ", $allowed_types)), E_USER_ERROR);
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf('Invalid scope. Valid scopes are %s.', implode(" ", $allowed_types)), E_USER_ERROR);
$line=-1;
for ($i=0; $i<count($_SESSION['ldap']->objectClasses) || $i==-1; $i++) {
if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$objectClass'")) $line = $i;
@ -136,7 +136,7 @@ class cache {
$this->refresh_cache();
// Check input variables
$allowed_types = array ( 'user', 'group', 'host', 'domain', '*' );
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf(_('Invalid scope. Valid scopes are %s.'), implode(" ", $allowed_types)), E_USER_ERROR);
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf('Invalid scope. Valid scopes are %s.', implode(" ", $allowed_types)), E_USER_ERROR);
// Create list of all allowed attributes
for ($i=0; $i<count($_SESSION['ldap']->objectClasses); $i++ ) {
if (strpos($_SESSION['ldap']->objectClasses[$i], 'MUST (')) {
@ -244,8 +244,8 @@ class cache {
if (substr($suffix, $dn)) $singlescope = $allowed_types[$i];
}
}
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf(_('Invalid scope. Valid scopes are %s.'), implode(" ", $allowed_types)), E_USER_ERROR);
if (!in_array($mode, $allowed_modes)) trigger_error(sprintf(_('Invalid mode. Valid modes are %s.'), implode(" ", $allowed_modes)), E_USER_ERROR);
if (!in_array($singlescope, $allowed_types)) trigger_error(sprintf('Invalid scope. Valid scopes are %s.', implode(" ", $allowed_types)), E_USER_ERROR);
if (!in_array($mode, $allowed_modes)) trigger_error(sprintf('Invalid mode. Valid modes are %s.', implode(" ", $allowed_modes)), E_USER_ERROR);
// Everything seems to be OK, start processing data
// Get Scope
foreach ($allowed_types as $scope) {
@ -254,7 +254,7 @@ class cache {
if (strpos($dn, $suffix)) $singlescope = $scope;
}
}
if (!isset($singlescope)) trigger_error(sprintf(_('Invalid dn: %s. DN not covered by any suffix.'), $dn), E_USER_WARN);
if (!isset($singlescope)) trigger_error(sprintf('Invalid dn: %s. DN not covered by any suffix.', $dn), E_USER_WARN);
// Refresh Cache
$this->refresh_cache();
if (is_array($attributes))

View File

@ -724,8 +724,8 @@ class accountContainer {
foreach ($modules as $module) {
if (!$this->module[$module]->module_complete()) {
$disabled = true;
$table[] = array ( 0 => array ( 'kind' => 'message', 'type' => 'ERROR', 'headline' => _('Check module'),
'text' => sprintf(_('Please set up all required attributes on %s page.'), $this->module[$module]->get_alias()) ));
$table[] = array ( 0 => array ( 'kind' => 'message', 'type' => 'ERROR', 'headline' => _('Some required information is missing'),
'text' => sprintf(_('Please set up all required attributes on page: %s'), $this->module[$module]->get_alias()) ));
}
}
}
@ -763,18 +763,21 @@ class accountContainer {
2 => array ('kind' => 'help', 'value' => 'create'));
if ($this->subpage=='finish') {
// Show success message
if ($this->dn_orig=='') $kind = _('created');
else $kind = _('modified');
$text = sprintf(_('%s has been %s.'), ucfirst($this->type), $kind);
if ($this->dn_orig == '') {
$text = _("Account was created successfully.");
}
else {
$text = _("Account was modified successfully.");
}
$return[] = array ( 0 => array ( 'kind' => 'message', 'type' => 'INFO', 'headline' => _('LDAP operation successful.'),
'text' => $text ));
$return[] = array ( 0 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'createagain',
'value' => sprintf(_('Create another %s'), $this->type) ),
'value' => _('Create another account')),
1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'outputpdf',
'value' => _('Create PDF file') ),
2 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'backmain',
'value' => sprintf (_('Back to %s list'), $this->type) ));
'value' => _('Back to account list')));
}
}
else $return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage), &$post);
@ -1044,7 +1047,7 @@ class accountContainer {
if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$subclass'")) $line = $i;
}
// Return error if objectClass isn't found
if ($line==-1) trigger_error (sprintf(_("ObjectClass %s required but not defined in ldap."), $subclass), E_USER_WARNING);
if ($line==-1) trigger_error (sprintf(_("ObjectClass %s required but not defined in LDAP."), $subclass), E_USER_WARNING);
// create array with must-attributes
// Get startposition in string
if (strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')) {
@ -1358,7 +1361,7 @@ class accountContainer {
$_SESSION['cache']->update_cache($this->$dn, 'add', $attr);
$success = ldap_delete($_SESSION['ldap']->server(), $this->dn_orig);
if (!$success) {
$errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to delete dn: %s.'), $this->dn_orig));
$errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to delete DN: %s.'), $this->dn_orig));
$stopprocessing = true;
}
if ($success)

View File

@ -220,12 +220,12 @@ class inetOrgPerson extends baseModule {
"Text" => _("Title of user, Mr., Ms., ...")
),
'givenName' => array (
"Headline" => _("Given name"),
"Text" => _("Given name of user. Only letters, - and spaces are allowed.")
"Headline" => _("First name"),
"Text" => _("First name of user. Only letters, - and spaces are allowed.")
),
'sn' => array (
"Headline" => _("Surname"),
"Text" => _("Surname of user. Only letters, - and spaces are allowed.")
"Headline" => _("Last name"),
"Text" => _("Last name of user. Only letters, - and spaces are allowed.")
),
'employeeType' => array (
"Headline" => _("Employee type"),

File diff suppressed because it is too large Load Diff

View File

@ -546,7 +546,7 @@ function print_option($values, $modulename, $old_options, &$tabindex) {
break;
// print error message for invalid types
default:
echo _("Unrecognized type") . ": " . $values['kind'] . "\n";
echo "Unrecognized type" . ": " . $values['kind'] . "\n";
break;
}
}

View File

@ -80,12 +80,12 @@ if ($_GET['type']) {
echo _('Please confirm:');
echo "</b></legend>\n";
echo "<input name=\"type\" type=\"hidden\" value=\"" . $_GET['type'] . "\">\n";
echo sprintf(_("Do you really want to remove the following %ss?\n"), $_GET['type']);
echo _("Do you really want to remove the following accounts?");
echo "<br>\n";
echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >";
for ($i=0; $i<count($users); $i++) {
echo "<tr>\n";
echo "<td>" . sprintf(_('%sname:'), ucfirst($_GET['type'])) . " $users[$i]</td>\n";
echo "<td>" . _("Account name:") . " $users[$i]</td>\n";
echo "<td>" . _('DN') . " " . $_SESSION['delete_dn'][$i] . "</td>\n";
echo "</tr>\n";
}

View File

@ -120,7 +120,7 @@ function displayHelp($helpEntry,$helpVariables) {
/* If no help number was submitted print error message */
if(!isset($_GET['HelpNumber']))
{
$errorMessage = _("Sorry no help number submitted.");
$errorMessage = "Sorry no help number submitted.";
echoHTMLHead();
statusMessage("ERROR","",$errorMessage);
echoHTMLFoot();

View File

@ -426,7 +426,7 @@ echo $_SESSION['header'];
<td width="100%" colspan="3" align="center">
<fieldset>
<legend>
<b><?php echo _('Overall page settings'); ?></b>
<b><?php echo _('Page settings'); ?></b>
</legend>
<table width="100%">
<tr>

View File

@ -244,7 +244,7 @@ function print_option($values, $modulename, $old_options, &$tabindex) {
break;
// print error message for invalid types
default:
echo _("Unrecognized type") . ": " . $values['kind'] . "\n";
echo "Unrecognized type" . ": " . $values['kind'] . "\n";
break;
}
}