translation update

This commit is contained in:
Roland Gruber 2011-07-12 19:23:27 +00:00
parent b086c38094
commit 453268409b
20 changed files with 3222 additions and 1396 deletions

File diff suppressed because it is too large Load Diff

View File

@ -154,7 +154,7 @@ if (get_request('meth','REQUEST') != 'ajax') {
}
} else {
printf('<small>(%s)</small>',_('no new attributes available for this entry'));
printf('<small>(%s)</small>',_('No new attributes available for this entry'));
}
echo '</div>';
@ -163,13 +163,13 @@ if (get_request('meth','REQUEST') != 'ajax') {
} else {
# Put our DIV there for the callback
echo '<fieldset>';
printf('<legend>%s</legend>',_('Add Attribute'));
printf('<legend>%s</legend>',_('Add new attribute'));
echo '<div id="ajADDATTR">';
echo '<table class="entry" cellspacing="0" align="center" border="0">';
echo '<td valign="top" align="center">';
printf('<select name="attr" onchange="ajDISPLAY(\'%s\',\'cmd=add_value_form&server_id=%s&dn=%s&attr=\'+this.value,\'%s\',\'append\');">',
'ADDATTR',$app['server']->getIndex(),$request['template']->getDNEncode(),_('Please Wait'));
'ADDATTR',$app['server']->getIndex(),$request['template']->getDNEncode(),_('Please wait'));
printf('<option value="%s">%s</option>','','');
foreach ($request['template']->getAvailAttrs() as $attribute)

View File

@ -57,7 +57,7 @@ foreach ($ldap['attrs']['need'] as $index => $values)
$ldap['attrs']['need'][$index]->show();
if (count($ldap['attrs']['need']) > 0) {
$request['page']->drawTitle(sprintf('%s <b>%s</b>',_('Add new objectClass to'),get_rdn($request['dn'])));
$request['page']->drawTitle(sprintf(_('Add new object class to <b>%s</b>'),get_rdn($request['dn'])));
$request['page']->drawSubTitle();
echo '<div style="text-align: center">';
@ -95,7 +95,7 @@ if (count($ldap['attrs']['need']) > 0) {
echo '</table>';
printf('<div style="text-align: center;"><br /><input type="submit" value="%s" /></div>',_('Add ObjectClass and Attributes'));
printf('<div style="text-align: center;"><br /><input type="submit" value="%s" /></div>',_('Add object class and attributes'));
echo '</form>';
echo '</div>';

View File

@ -34,7 +34,7 @@ if ($request['attribute']->isReadOnly())
# Render the form
if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST') != 'ajax') {
# Render the form.
$request['page']->drawTitle(sprintf('%s <b>%s</b> %s <b>%s</b>',_('Add new'),$request['attr'],_('value to'),get_rdn($request['dn'])));
$request['page']->drawTitle(sprintf(_('Add new <b>%s</b> value to <b>%s</b>'),$request['attr'],get_rdn($request['dn'])));
$request['page']->drawSubTitle();
if (! strcasecmp($request['attr'],'objectclass')) {
@ -114,7 +114,7 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
echo '<br />';
printf('<input id="save_button" type="submit" value="%s" %s />',
_('Add new ObjectClass'),
_('Add new object class'),
(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'entry_form\'),\'%s\');"',_('Updating Object')) : ''));
echo '</td></tr></table>';
echo '</td>';
@ -146,7 +146,7 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
_('Maximum Length'),number_format($sattr->getMaxLength()),_('characters'));
echo '<br />';
printf('<input type="submit" id="save_button" name="submit" value="%s" />',_('Add New Value'));
printf('<input type="submit" id="save_button" name="submit" value="%s" />',_('Add value'));
echo '</td></tr></table>';
echo '</td></tr>';

View File

@ -66,7 +66,7 @@ if ($app['script_cmd'])
if (isAjaxEnabled() && get_request('refresh','REQUEST') && get_request('refresh','REQUEST') != get_request('frame','REQUEST')) {
echo '<script type="text/javascript" language="javascript">';
printf("ajDISPLAY('%s','cmd=refresh&server_id=%s&noheader=%s','%s');",
get_request('refresh','REQUEST'),$app['server']->getIndex(),get_request('noheader','REQUEST',false,0),_('Auto refresh'));
get_request('refresh','REQUEST'),$app['server']->getIndex(),get_request('noheader','REQUEST',false,0),('Auto refresh'));
echo '</script>';
}

View File

@ -25,7 +25,7 @@ $request['page']->setDN($request['dn']);
$request['page']->accept();
# Render the form
$request['page']->drawTitle(sprintf('%s <b>%s</b>',_('Compare another DN with'),get_rdn($request['dn'])));
$request['page']->drawTitle(sprintf(_('Compare another DN with <b>%s</b>'),get_rdn($request['dn'])));
$request['page']->drawSubTitle();
printf('<script type="text/javascript" src="%sdnChooserPopup.js"></script>',JSDIR);

View File

@ -97,8 +97,8 @@ if ($request['recursive']) {
_('DN'),$request['dnDST'],_('has been created.'));
else
$copy_message = sprintf('%s %s: <b>%s</b> %s',
$request['remove'] ? _('Move NOT successful') : _('Copy NOT successful'),
_('DN'),$request['dnDST'],_('has NOT been created.'));
$request['remove'] ? _('Move not successful') : _('Copy not successful'),
_('DN'),$request['dnDST'],_('has not been created.'));
}
}
@ -107,7 +107,7 @@ if ($copy_result) {
$ldap['DST']->getIndex(),rawurlencode($request['dnDST']),$ldap['DST']->getIndex());
system_message(array(
'title'=>_('Copy Entry'),
'title'=>_('Copy'),
'body'=>$copy_message,
'type'=>'info'),
$redirect_url);
@ -157,8 +157,8 @@ function r_copy_dn($serverSRC,$serverDST,$snapshottree,$dnSRC,$dnDST,$remove) {
_('DN'),$dnDST,_('has been created.')));
else
array_push($copy_message,sprintf('%s %s: <b>%s</b> %s',
$remove ? _('Move NOT successful') : _('Copy NOT successful'),
_('DN'),$dnDST,_('has NOT been created.')));
$remove ? _('Move not successful') : _('Copy not successful'),
_('DN'),$dnDST,_('has not been created.')));
}
return $copy_message;

View File

@ -81,7 +81,7 @@ if ($add_result) {
$redirect_url .= sprintf('&refresh=SID_%s_nodes&noheader=1',$app['server']->getIndex());
system_message(array(
'title'=>_('Create Entry'),
'title'=>_('Create object'),
'body'=>$create_message,
'type'=>'info'),
$redirect_url);

View File

@ -49,7 +49,7 @@ foreach ($request['template']->getAttributes() as $attribute) {
# Check for unique attributes
$app['server']->checkUniqueAttrs($request['template']->getDN(),$request['template']->getLDAPadd());
$request['page']->drawTitle(_('Create LDAP Entry'));
$request['page']->drawTitle(_('Create object'));
$request['page']->drawSubTitle(sprintf('%s: <b>%s</b>&nbsp;&nbsp;&nbsp;%s: <b>%s</b>',
_('Server'),$app['server']->getName(),_('Container'),$request['template']->getContainer()));

View File

@ -62,7 +62,7 @@ if (isset($app['server']) && ! is_null($request['container'])) {
echo '<tr>';
echo '<td class="blank">&nbsp;</td>';
printf('<td class="icon"><a href="%s"><img src="%s/up.png" alt="Up" /></a></td>',$href['up'],IMGDIR);
printf('<td colspan="2"><a href="%s">%s...</a></td>',$href['up'],_('Back Up'));
printf('<td colspan="2"><a href="%s">%s...</a></td>',$href['up'],_('Back up'));
echo '</tr>';
if (! count($request['children']))
@ -90,7 +90,7 @@ if (isset($app['server']) && ! is_null($request['container'])) {
printf('<tr><td class="heading" colspan="3">%s:</td><td class="heading">%s</td></tr>',_('Server'),$server->getName());
foreach ($server->getBaseDN() as $dn) {
if (! $dn) {
printf('<tr><td class="blank">&nbsp;</td><td colspan="3">(%s)</td></tr>',_('Could not determine base DN'));
printf('<tr><td class="blank">&nbsp;</td><td colspan="3">(%s)</td></tr>',('Could not determine base DN'));
} else {
$href['return'] = sprintf("javascript:returnDN('%s%s')",($request['rdn'] ? sprintf('%s,',$request['rdn']) : ''),rawurlencode($dn));

View File

@ -36,8 +36,8 @@ $actionString = array(
$actionErrorMsg = array(
'add' => _('Could not add object'),
'delete' => _('Could not delete object'),
'modrdn' => _('Could not rename object'),
'moddn' => _('Could not rename object'),
'modrdn' => _('Could not rename the entry.'),
'moddn' => _('Could not rename the entry.'),
'modify' => _('Could not modify object')
);

View File

@ -657,11 +657,11 @@ class PageRender extends Visitor {
if (! $attribute->getOldValue($i))
return;
printf('<small>[%s]</small>',_('Binary Value'));
printf('<small>[%s]</small>',_('Binary value'));
}
final protected function drawCurrentValueBinaryAttribute($attribute,$i) {
printf('<small>[%s]</small>',_('Binary Value'));
printf('<small>[%s]</small>',_('Binary value'));
if (in_array($attribute->getName(),array('objectsid')))
printf('<small> (%s)</small>', binSIDtoText($attribute->getValue(0)));

View File

@ -695,7 +695,7 @@ class TemplateRender extends PageRender {
if (is_null($title))
switch ($this->getMode()) {
case 'creation':
$title = _('Create Object');
$title = _('Create object');
break;
case 'modification':
@ -717,8 +717,7 @@ class TemplateRender extends PageRender {
switch ($this->getMode()) {
case 'creation':
$subtitle = sprintf('%s: <b>%s</b>&nbsp;&nbsp;&nbsp;%s: <b>%s</b>',
_('Server'),$this->getServer()->getName(),
$subtitle = sprintf('%s: <b>%s</b>',
_('Container'),htmlspecialchars($this->container));
if ($this->template_id) {
@ -1096,11 +1095,11 @@ class TemplateRender extends PageRender {
if (isAjaxEnabled())
return sprintf($this->layout['actionajax'],IMGDIR,'cut.png',_('Cut'),
htmlspecialchars($href),_('Copy this object to another location, a new DN, or another server'),
htmlspecialchars($href),_('Copy or move this entry'),
htmlspecialchars($href),str_replace('\'','\\\'',_('Loading')),_('Copy or move this entry'));
else
return sprintf($this->layout['action'],IMGDIR,'cut.png',_('Cut'),
htmlspecialchars($href),_('Copy this object to another location, a new DN, or another server'),
htmlspecialchars($href),_('Copy or move this entry'),
_('Copy or move this entry'));
}
@ -1167,11 +1166,11 @@ class TemplateRender extends PageRender {
if (isAjaxEnabled())
return sprintf($this->layout['actionajax'],IMGDIR,'compare.png',_('Compare'),
htmlspecialchars($href),_('Compare this entry with another'),
htmlspecialchars($href),_('Compare this DN with another'),
htmlspecialchars($href),str_replace('\'','\\\'',_('Loading')),_('Compare with another entry'));
else
return sprintf($this->layout['action'],IMGDIR,'compare.png',_('Compare'),
htmlspecialchars($href),_('Compare this entry with another'),_('Compare with another entry'));
htmlspecialchars($href),_('Compare this DN with another'),_('Compare with another entry'));
}
protected function getMenuItemCreate() {
@ -1456,7 +1455,7 @@ class TemplateRender extends PageRender {
printf('%s: ',sprintf(_('Step %s of %s'),$page,$this->pagelast));
if ($page == 1)
echo _('Container and ObjectClass(es)');
echo _('Container and object class(es)');
else
echo _('Specify attributes and values');
@ -1539,7 +1538,7 @@ class TemplateRender extends PageRender {
else
// @todo cant use AJAX here, it affects file uploads.
printf('<td style="text-align: center;"><input type="submit" id="create_button" name="submit" value="%s" /></td>',
_('Create Object'));
_('Create object'));
echo '</tr>';
}
@ -2072,7 +2071,7 @@ function fillRec(id,value) {
if (isAjaxEnabled())
return sprintf('(<a href="cmd.php?%s" title="%s %s" onclick="return ajDISPLAY(\'ADDVALUE%s\',\'%s&amp;raw=1\',\'%s\',1);">%s</a>)',
$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),$attribute->getName(),
$href_parm,str_replace('\'','\\\'',_('Add Value to Attribute')),_('add value'));
$href_parm,str_replace('\'','\\\'',_('Add an additional value to attribute')),_('add value'));
else
return sprintf('(<a href="cmd.php?%s" title="%s %s">%s</a>)',
$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),_('add value'));
@ -2090,7 +2089,7 @@ function fillRec(id,value) {
if (isAjaxEnabled())
return sprintf('(<a href="cmd.php?%s" title="%s %s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>)',
$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),
$href_parm,str_replace('\'','\\\'',_('Add Value to Attribute')),_('add value'));
$href_parm,str_replace('\'','\\\'',_('Add an additional value to attribute')),_('add value'));
else
return sprintf('(<a href="cmd.php?%s" title="%s %s">%s</a>)',
$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),_('add value'));
@ -2428,7 +2427,7 @@ function deleteAttribute(attrName,friendlyName,i)
echo ' if (!component.value) {'."\n";
printf(' component.value = \'%s\';',$pwd);
echo "\n";
printf(' alert(\'%s:\n%s\');',_('A random password was generated for you'),$pwd);
printf(' alert(\'%s:\n%s\');',('A random password was generated for you'),$pwd);
echo "\n";
echo ' };'."\n";
echo ' i++;'."\n";

View File

@ -773,11 +773,6 @@ class Config {
public function getFriendlyHTML($attr) {
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
debug_log('Entered (%%)',3,0,__FILE__,__LINE__,__METHOD__,$fargs);
if ($this->haveFriendlyName($attr))
return sprintf('<acronym title="%s %s">%s</acronym>',
_('Alias for'),$attr->getName(false),$this->getFriendlyName($attr));
else
return $attr->getName(false);
}

View File

@ -134,8 +134,8 @@ class ldap_pla extends myldap {
default:
system_message(array(
'title'=>_('Unknown request for Object value.'),
'body'=>sprintf(_('Attempt to obtain value %s from %s'),$key,get_class($this)),
'title'=>('Unknown request for Object value.'),
'body'=>sprintf(('Attempt to obtain value %s from %s'),$key,get_class($this)),
'type'=>'error'));
}
}

View File

@ -562,8 +562,8 @@ class myldap extends DS {
if (! $this->getValue('server','tls') || (function_exists('ldap_start_tls') && ! @ldap_start_tls($resource))) {
system_message(array(
'title'=>sprintf('%s (%s)',_('Could not start TLS.'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s',_('Error'),_('Could not start TLS. Please check your LDAP server configuration.')),
'title'=>sprintf('%s (%s)',('Could not start TLS.'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s',('Error'),('Could not start TLS. Please check your LDAP server configuration.')),
'type'=>'error'));
return false;
@ -682,8 +682,8 @@ class myldap extends DS {
if (! (isset($rootdse['supportedcontrol']) && in_array('2.16.840.1.113730.3.4.18',$rootdse['supportedcontrol']))) {
system_message(array(
'title'=>sprintf('%s %s',_('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s',_('Error'),_('Your LDAP server doesnt seem to support this control')),
'title'=>sprintf('%s %s',('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s',('Error'),('Your LDAP server doesnt seem to support this control')),
'type'=>'error'));
return false;
@ -696,8 +696,8 @@ class myldap extends DS {
foreach ($this->getValue('proxy','attr') as $attr => $var) {
if (! isset($_SERVER[$var])) {
system_message(array(
'title'=>sprintf('%s %s',_('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s)',_('Error'),_('Attribute doesnt exist'),$var),
'title'=>sprintf('%s %s',('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s)',('Error'),('Attribute doesnt exist'),$var),
'type'=>'error'));
$missing = true;
@ -730,8 +730,8 @@ class myldap extends DS {
if (count($search) != 1) {
system_message(array(
'title'=>sprintf('%s %s',_('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s)',_('Error'),_('Search for DN returned the incorrect number of results'),count($search)),
'title'=>sprintf('%s %s',('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s)',('Error'),('Search for DN returned the incorrect number of results'),count($search)),
'type'=>'error'));
return false;
@ -748,8 +748,8 @@ class myldap extends DS {
if (! ldap_set_option($resource,LDAP_OPT_SERVER_CONTROLS,array($ctrl))) {
system_message(array(
'title'=>sprintf('%s %s',_('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s) for <b>%s</b>',_('Error'),$this->getErrorMessage($method),$this->getErrorNum($method),$method),
'title'=>sprintf('%s %s',('Unable to start proxy connection'),$this->getName()),
'body'=>sprintf('<b>%s</b>: %s (%s) for <b>%s</b>',('Error'),$this->getErrorMessage($method),$this->getErrorNum($method),$method),
'type'=>'error'));
return false;

View File

@ -1989,8 +1989,8 @@ function draw_jpeg_photo($server,$dn,$attr_name='jpegphoto',$index,$draw_delete_
if (! isset($jpeg_data[$attr_name][$index]) || ! $jpeg_data[$attr_name][$index]) {
system_message(array(
'title'=>_('Unable to retrieve image'),
'body'=>sprintf('%s %s',
_('Could not fetch jpeg data for attribute'),$attr_name),
'body'=>sprintf(_('Could not fetch jpeg data from LDAP server for attribute [%s].'),
$attr_name),
'type'=>'warn'));
# This should atleast generate some text that says "Image not available"
@ -2006,8 +2006,8 @@ function draw_jpeg_photo($server,$dn,$attr_name='jpegphoto',$index,$draw_delete_
$jpeg_temp_dir = realpath($_SESSION[APPCONFIG]->getValue('jpeg','tmpdir').'/');
if (! is_writable($jpeg_temp_dir))
system_message(array(
'title'=>_('Unable to write to jpeg tmp directory'),
'body'=>_('Please set jpeg,tmpdir to a writable directory in the phpLDAPadmin config.php'),
'title'=>('Unable to write to jpeg tmp directory'),
'body'=>('Please set jpeg,tmpdir to a writable directory in the phpLDAPadmin config.php'),
'type'=>'warn'));
else {
@ -2017,8 +2017,8 @@ function draw_jpeg_photo($server,$dn,$attr_name='jpegphoto',$index,$draw_delete_
if (! $outjpeg) {
system_message(array(
'title'=>_('Error writing to jpeg tmp directory'),
'body'=>sprintf(_('Please check jpeg,tmpdir is a writable directory in the phpLDAPadmin config.php'),$jpeg_temp_dir),
'title'=>('Error writing to jpeg tmp directory'),
'body'=>sprintf(('Please check jpeg,tmpdir is a writable directory in the phpLDAPadmin config.php'),$jpeg_temp_dir),
'type'=>'warn'));
} elseif ($outjpeg < 6) {

View File

@ -457,7 +457,7 @@ class ImportLDIF extends Import {
$attribute = $this->template->getAttribute($action_attribute_value);
if (is_null($attribute))
return $this->error(sprintf('%s %s',_('Attempting to delete a non existant attribute'),$action_attribute_value),
return $this->error(sprintf('%s %s',_('Attempting to delete a non existent attribute'),$action_attribute_value),
array_merge(array($currentLine),$lines));
$deleteattr = true;