![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 531bef2)
raw | patch | inline | side by side (parent: 531bef2)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 29 Jul 2010 16:21:26 +0000 (16:21 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 29 Jul 2010 16:21:26 +0000 (16:21 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19290 594d385d-05f5-0310-b6e9-bd551577e9d8
52 files changed:
index fa3b86694869f9aad19815ddadbadd1c96442c48..1bcfa141c3027f24266bfbb8e284675832445e09 100644 (file)
/* If there is no entry in the xml file for this class, display an error message */
if($helpdir == ""){
- $smarty->assign("help_contents","<br><h2>"._("There is no helpfile specified for this class"))."</h2>";
+ $smarty->assign("help_contents","<br><h2>"._("There is no help file specified for this class"))."</h2>";
$header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
$display= ( $header.$smarty->fetch(get_template_path('help.tpl')));
echo $display;
}else{
/* There was a file requested which actually doesn't exists */
- $smarty->assign("help_contents","<h2>".sprintf(_("Helpdir '%s' is not accessible, can't read any helpfiles."),$helpdir))."</h2><br>";
+ $smarty->assign("help_contents","<h2>".sprintf(_("Help directory '%s' is not accessible, can't read any help files."),$helpdir))."</h2><br>";
$header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
$display= ( $header.$smarty->fetch(get_template_path('help.tpl')));
echo $display;
index 152ba449c37a0d18d804868fec430dfb8e103449..ba0d1d530153daad12c05376db13f9c1a55b9424 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->get_cfg_value("core",'warnSSL') == 'true') {
- $smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
+ $smarty->assign("ssl", sprintf(_("This session is not encrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
} else {
$smarty->assign("ssl", "");
}
@@ -286,7 +286,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
if (!$htaccess_authenticated) {
$username= $_POST["username"];
if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)) {
- $message= _("Please specify a valid username!");
+ $message= _("Please specify a valid user name!");
$ok= false;
} elseif (mb_strlen($_POST["password"], 'UTF-8') == 0) {
$message= _("Please specify your password!");
index 09dd56d22250b8cc791777a7a90fa21d73ca8980..07c69d1dbc5c109d7a907269dd4bf2c688f95a84 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
require ("$plugin_dir/main.inc");
} else {
msg_dialog::display(
- _("Plugin"),
+ _("Plug-in"),
sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
FATAL_ERROR_DIALOG);
exit();
index 99a5d49cb8b96d866fc2c1d594aa92ecce6ff82d..b42aadf8181a9fab77920fc5dd15fadbc7707e1a 100644 (file)
}
}
if(!passwordMethod::is_harmless($_POST['new_password'])){
- $message[]= _("The password contains possibly problematic unicode characters!");
+ $message[]= _("The password contains possibly problematic Unicode characters!");
}
/* Validate */
index d41f5733dcc998ca63df8c155c892608cdeec95b..15ad1983b333b545da67ae69647bb28a8f6ce3c0 100644 (file)
</td>
<td>
{if !$acl_writeable}
- <select size="1" name="dummy_t" title="{t}Select an acl type{/t}" disabled>
+ <select size="1" name="dummy_t" title="{t}Select an ACL type{/t}" disabled>
{html_options options=$aclTypes selected=$aclType}
<option disabled> </option>
</select>
{else}
- <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">
+ <select size="1" name="aclType" title="{t}Select an ACL type{/t}" onChange="document.mainform.submit()">
{html_options options=$aclTypes selected=$aclType}
<option disabled> </option>
</select size=1>
diff --git a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
index b2399f861c9e9b65f371e233d9ac14a17a490716..66d751967fd3921f8c877b71fdde0fec1f0ad6e2 100644 (file)
<br>
<br>
{if $Complete == false}
- {t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fullfill the policies.{/t}
+ {t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fulfill the policies.{/t}
<br>
{t}Remember that some properties like taken snapshots will not be copied!{/t}
{t}Or if you copy or cut an entry within GOsa and delete the source object, you may get errors while pasting this object again!{/t}
diff --git a/gosa-core/ihtml/themes/default/islocked.tpl b/gosa-core/ihtml/themes/default/islocked.tpl
index 566c1d43244c334bcdcd4c3f6659047cb2b91726..b403b7087a386ae26f680d751482cfffecb11f06 100644 (file)
</p>
<p>
- {t}If this lock detection is false, the other person has obviously closed the webbrowser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
+ {t}If this lock detection is false, the other person has obviously closed the web browser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
</p>
<hr>
index 60e02adea648533541043730d1daf366d9a7cc28..d0f498bff8080e1a25347f21c0bf2787cdef0d52 100644 (file)
<div class='login-box-container'>
<div class='login-element-container'>
<div style='background-color:green'>
- <div class='login-label'><label for='username'>{t}Username{/t}</label></div>
+ <div class='login-label'><label for='username'>{t}User name{/t}</label></div>
<div class='login-input'>
<input type='text' name='username' maxlength='40' value='{$username}'
- title='{t}Username{/t}' onFocus="nextfield= 'password';" />
+ title='{t}User name{/t}' onFocus="nextfield= 'password';" />
</div>
</div>
<div class="clear"></div>
diff --git a/gosa-core/ihtml/themes/default/msg_dialog.tpl b/gosa-core/ihtml/themes/default/msg_dialog.tpl
index 6d8e4f24abf7def615733bc0ace19c6b1223fbe8..24ceb2b812c137278257a6490ea4144d346ed3df 100644 (file)
<tr>
<td colspan='2' align='center'>
{if $i_Type == $smarty.const.ERROR_DIALOG || $i_Type == $smarty.const.WARNING_DIALOG || $i_Type == $smarty.const.INFO_DIALOG}
- <button type='submit' name='MSG_OK{$i_ID}'>{t}Ok{/t}</button>
+ <button type='submit' name='MSG_OK{$i_ID}'>{t}OK{/t}</button>
{elseif $buttononst.CONFIRM_DIALOG || $i_Type == $smarty.const.OK_CANCEL_DIALOG}
- <button type='submit' name='MSG_OK{$i_ID}'>{t}Ok{/t}</button>
+ <button type='submit' name='MSG_OK{$i_ID}'>{t}OK{/t}</button>
<button type='submit' name='MSG_CANCEL{$i_ID}'>{t}Cancel{/t}</button>
{/if}
</td>
{/if}
{if $i_Type == $smarty.const.ERROR_DIALOG || $i_Type == $smarty.const.WARNING_DIALOG || $i_Type == $smarty.const.INFO_DIALOG}
<button id='MSG_OK{$i_ID}' type='button' name='MSG_OK{$i_ID}'
- onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+ onClick='next_msg_dialog();'>{t}OK{/t}</button>
{elseif $i_Type == $smarty.const.CONFIRM_DIALOG}
<button id='MSG_OK{$i_ID}' type='submit' name='MSG_OK{$i_ID}'
- onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+ onClick='next_msg_dialog();'>{t}OK{/t}</button>
<button type='button' name='MSG_CANCEL{$i_ID}'
onClick='next_msg_dialog();'>{t}Cancel{/t}</button>
{elseif $i_Type == $smarty.const.OK_CANCEL_DIALOG}
<button id='MSG_OK{$i_ID}' type='submit' name='MSG_OK{$i_ID}'
- onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+ onClick='next_msg_dialog();'>{t}OK{/t}</button>
<button type='submit' name='MSG_CANCEL{$i_ID}'
onClick='next_msg_dialog();'>{t}Cancel{/t}</button>
{/if}
diff --git a/gosa-core/ihtml/themes/default/sizelimit.tpl b/gosa-core/ihtml/themes/default/sizelimit.tpl
index 7397de0c8deaf42c45e5f2f4db210775dae4a45b..674a216b4b2d6e928c62834b403329c971abac4d 100644 (file)
<b>{t}Please choose the way to react for this session{/t}:</b>
<p>
<input type="radio" name="action" value="ignore">{t}ignore this error and show all entries the LDAP server returns{/t}<br>
-<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined sizelimit and let me use filters instead{/t}<br>
+<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined size limit and let me use filters instead{/t}<br>
<input type="radio" name="action" value="newlimit">{$limit_message}
</p>
<hr>
diff --git a/gosa-core/ihtml/themes/default/snapshotdialog.tpl b/gosa-core/ihtml/themes/default/snapshotdialog.tpl
index c4524925ad984ff87e418432a3fe6b87e71d1faf..f02ac79ca6bba0add68cf1110a2804606e6e4c65 100644 (file)
{t}This procedure will restore a snapshot of the selected object. It will replace the existing object after pressing the restore button.{/t}
<br>
<br>
-{t}Remember that DNS configuration and database entries could not be restored. For some objects it is only nescessary to open and save them again (goFon), but some entries must be recreated manually (glpi).{/t}
+{t}Remember that DNS configuration and database entries could not be restored. For some objects it is only necessary to open and save them again (goFon), but some entries must be recreated manually (glpi).{/t}
<br>
<br>
{t}Don't forget to check references to other objects, for example does the selected printer still exists ?{/t}
</tr>
<tr>
<td>
- <b>{t}Timestamp{/t}</b>
+ <b>{t}Time stamp{/t}</b>
</td>
<td>
{$CurrentDate}
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 587cdcc901c95143a375540d660294cf147e2e7b..25d4fa898b21b31903afac0bd001bad91b0ffaba 100644 (file)
/* Check if given dn is valid and ldap search was succesfull */
if(!$res){
- $msg= sprintf(_("Copy and paste failed!")."<br><br>"._("Error").": "._("'%s' is no vaild LDAP object"), bold(LDAP::fix($dn)));
+ $msg= sprintf(_("Copy and paste failed!")."<br><br>"._("Error").": "._("'%s' is no valid LDAP object"), bold(LDAP::fix($dn)));
msg_dialog::display(_("Internal error"), $msg, ERROR_DIALOG);
new log("copy","all/all",$dn,array(), $msg);
return(FALSE);
index 49f9853e4e9727a5b7cd2518b4f1dd890b90c713..296c2d1e497a69e6f14813b5995ee31d2f03c694 100644 (file)
break;
default:
- msg_dialog::display(_("Internal error"), sprintf(_("Unkown ACL type '%s'!"), $type), ERROR_DIALOG);
+ msg_dialog::display(_("Internal error"), sprintf(_("Unknown ACL type '%s'!"), $type), ERROR_DIALOG);
$a= array();
}
return ($a);
index eba2e040e8cde2512b6cf50755126b2fc47607c6..21a4731270adf4b073cda37fc91eb684e3a1707e 100644 (file)
"name" => "htaccessAuthentication",
"type" => "bool",
"default" => "false",
- "description" => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. kerberos to authenticate the users."),
+ "description" => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. Kerberos to authenticate the users."),
"check" => "gosaProperty::isBool",
"migrate" => "",
"group" => "authentification",
index 48d1a5e03df370c4f77397802688d9515e35dc49..a7d1fec84ddfca166a7cd4a5684e66075b68f41a 100644 (file)
$first = $this->config->data['TABS'][$tabType][0];
if(!class_available($first['CLASS'])){
msg_dialog::display(_("Internal error"),
- sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']),
+ sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']),
ERROR_DIALOG);
}else{
$this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory);
$first = $this->config->data['TABS'][$tabType][0];
if(!class_available($first['CLASS'])){
msg_dialog::display(_("Internal error"),
- sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']),
+ sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']),
ERROR_DIALOG);
}else{
$this->tabObject= new $tab($this->config,$this->config->data['TABS'][$tabType], $this->dn,$aclCategory);
index a6cbc9410df2aa1652403bcd071599be471e8e62..532adb15720add634ae0007878dfe6b4113b0bce 100644 (file)
*/
public function get_object_info()
{
- return(_("You are currently editing mutliple entries."));
+ return(_("You are currently editing multiple entries."));
}
diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index 437ffe12e1a649bd63bccc83c458e343497d65be..39739338e1b7a972d0eb566652bdc2ccd9916df6 100644 (file)
if($exists){
$str .= "<p style='padding-left:20px;'><a href='?plug=".$id."'><b>"._($name)."</b></a></p>";
}else{
- $str .= "<p style='padding-left:20px;'><b>"._($name)."</b> ("._("No help available for this plugin.").")</p>";
+ $str .= "<p style='padding-left:20px;'><b>"._($name)."</b> ("._("No help available for this plug-in.").")</p>";
}
}
return (utf8_decode($str));
index 2024321f3e6371307b6ba27898bc10026bc9103b..515830aa6ebf0be3bd7d032934084ef0ae40d2d5 100644 (file)
<td><span>"._("Generating this page caused the PHP interpreter to raise some errors!")."</span></td>
<td align='right'>
<a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&body=%BUGBODY%\">
- ".image('images/mailto.png')." "._("Send bugreport")."
+ ".image('images/mailto.png')." "._("Send bug report")."
</a>
</td>
<td align='right'>
index efd47aa0bc63c90ec9a69afa2feba0f2b025f825..817c1b9117d90ff95ebc170f6875d9df0c1aa623 100644 (file)
public static function okButton()
{
- return sprintf(_("Ok"));
+ return sprintf(_("OK"));
}
diff --git a/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc b/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc
index 28ed6cd8982608b6b9253dd5048748f169b63492..60e7bb7d58a0ea33dcb5ab24b4f7ef1ac09bcfe1 100644 (file)
if(empty($entry['filter'])){
$messages[] = msgPool::required(_("Filter")." {$nr}");
}elseif(!preg_match("/^\(/", $entry['filter'])){
- $messages[] = msgPool::invalid(_("Filter")." {$nr}", $entry['filter'],'', '(objectClass=gosaAccount)'." - "._("Surrounding brakets are required!"));
+ $messages[] = msgPool::invalid(_("Filter")." {$nr}", $entry['filter'],'', '(objectClass=gosaAccount)'." - "._("Surrounding brackets are required!"));
}else{
// Check if filter is valid
diff --git a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
index eac830beb5ac4fdc18bbc2aed8892fc54840e441..485f28609cc855509d44e6b0f7292107068f44da 100644 (file)
class propertyEditor extends management
{
var $plHeadline= "Preferences";
- var $plDescription= "Configure global and special GOsa settings like hooks and plugin parameters";
+ var $plDescription= "Configure global and special GOsa settings like hooks and plug-in parameters";
var $plIcon = "plugins/propertyEditor/images/plugin.png";
var $toBeMigrated = array();
diff --git a/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl b/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl
index 58f4b05dc10b09cc1028f7c9fc90d01da3625738..e48d80769d16c8a064c4bcda96158d0a273991e6 100644 (file)
<h3>{t}Command verifier{/t}</h3>
<p>
- {t}Here you can execute commands in the way GOsa does and check the generated results or errors. This can be very usefull especially for the post events (postcreate, postmodify and postremove) due to the fact that these hook are executed silently.{/t}
+ {t}Here you can execute commands in the way GOsa does and check the generated results or errors. This can be very useful especially for the post events (postcreate, postmodify and postremove) due to the fact that these hook are executed silently.{/t}
</p>
<p>
<b>
- {t}Please be carefull here, all commands will really be executed on your machine and may break things!{/t}
+ {t}Please be careful here, all commands will really be executed on your machine and may break things!{/t}
</b>
</p>
diff --git a/gosa-core/plugins/addons/propertyEditor/migrate.tpl b/gosa-core/plugins/addons/propertyEditor/migrate.tpl
index ad601eaa78703153c1ac98d2673b81ddbb2aeda6..12c9147aa4efe2b0d4d401777efbb7ed2acdfebf 100644 (file)
<div id="mainlist">
<div class="mainlist-header">
- <p>{t}Property migration assistent{/t} - {t}Migration steps left{/t}: {$leftSteps}</p>
+ <p>{t}Property migration assistant{/t} - {t}Migration steps left{/t}: {$leftSteps}</p>
<div class="mainlist-nav">
<div style='width:100%; height: 400px; overflow: scroll; padding: 5px;'>
index 777ecc4b7451877ab17689a46c0c69c4012c9411..09d9fcbebb3c0c180c702843b5a747766e17b796 100644 (file)
<multiSelect>true</multiSelect>
<template>acl-list.tpl</template>
<module>acl</module>
- <label>List of acls</label>
+ <label>List of ACLs</label>
<defaultSortColumn>1</defaultSortColumn>
<objectType>
- <label>Acl</label>
+ <label>ACL</label>
<objectClass>gosaAcl</objectClass>
<category>acl</category>
<class>acl</class>
index 59e0731681764d77b570339e903f818477589d42..8a8310b816c55e40197c7d2973b417669a6becb6 100644 (file)
{/if}
{if $dialogState eq 'create'}
-<h3>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled> </option></select> {if $javascript eq 'false'}<button type='submit' name='refresh'>{msgPool type=applyButton}</button>{/if}
+<h3>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an ACL type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled> </option></select> {if $javascript eq 'false'}<button type='submit' name='refresh'>{msgPool type=applyButton}</button>{/if}
</h3>
<hr>
diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index c3b121fa87b8c1f9378b25239412927633a9608f..439f0da3f12190f36a6153951160f8830d217821 100644 (file)
"name" => "aclRoleRDN",
"type" => "rdn",
"default" => "ou=aclroles,",
- "description" => _("The 'aclRoleRDN' statement defines the location where new acl roles will be created. The default is 'ou=aclroles,'."),
+ "description" => _("The 'aclRoleRDN' statement defines the location where new ACL roles will be created. The default is 'ou=aclroles,'."),
"check" => "gosaProperty::isRdn",
"migrate" => "migrate_aclRoleRDN",
"group" => "plugin",
diff --git a/gosa-core/plugins/admin/acl/paste_role.tpl b/gosa-core/plugins/admin/acl/paste_role.tpl
index ea64774c696f47bcf9a59d1aa9338d21257e00cc..ab4426a6cd91a2fa797703283d3fb9fca84299b3 100644 (file)
-<table summary="{t}Paste acl-role{/t}">
+<table summary="{t}Paste ACL-role{/t}">
<tr>
<td>
{t}Name{/t}
diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
index 979c2062e364ccc7cafe1b2514891b9bc3c0585c..e48b4ace99dffa7b6d3f52020c17bdd0106e00f3 100644 (file)
</div>
<p>
-{t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t}
+{t}Modifying a departments naming attribute 'ou' or base may corrupt ACLs and snapshot entries for all entire objects.{/t}
</p>
<p>
{t}GOsa can NOT fix this for you, yet.{/t}
diff --git a/gosa-core/plugins/admin/groups/class_group.inc b/gosa-core/plugins/admin/groups/class_group.inc
index ce5ac485122ce9fc1fd8aaa75596a1b1be83dda2..32db6fbb1f4d304e3ead9358855416422fc3ff6d 100644 (file)
$this->memberList->setEditable(false);
$this->memberList->setWidth("100%");
$this->memberList->setHeight("300px");
- $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+ $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
$this->memberList->setColspecs(array('20px','*','*','*','20px'));
$this->memberList->setDefaultSortColumn(1);
}
$smarty->assign("sambaDomains", set_post($domains));
$smarty->assign("sambaDomainName", set_post($this->sambaDomainName));
- $groupTypes= array(0 => _("Samba group"), 512 => _("Domain admins"), 513 => _("Domain users"),
+ $groupTypes= array(0 => _("Samba group"), 512 => _("Domain administrators"), 513 => _("Domain users"),
514 => _("Domain guests"));
/* Don't loose special groups! If not key'ed above, add it to
$this->commonList->setEditable(false);
$this->commonList->setWidth("100%");
$this->commonList->setHeight("120px");
- $this->commonList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+ $this->commonList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
$this->commonList->setColspecs(array('20px','*','*','*','20px'));
$this->commonList->setDefaultSortColumn(1);
$this->partialList->setEditable(false);
$this->partialList->setWidth("100%");
$this->partialList->setHeight("120px");
- $this->partialList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+ $this->partialList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
$this->partialList->setColspecs(array('20px','*','*','*','20px'));
$this->partialList->setDefaultSortColumn(1);
}
diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index c190df15f2548381d0a519decf87c961638ec605..4c217fa1c96204c081b370f07a663a876cda8118 100644 (file)
array(
"image" => "plugins/groups/images/select_group.png",
"plugin" => "group",
- "alt" => _("Posix"),
- "title" => _("Edit posix properties")
+ "alt" => _("POSIX"),
+ "title" => _("Edit POSIX properties")
),
"gosaMailAccount" =>
diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 5de3def4cd2f8141103b8beb64121aa3d014bf9a..70191167f919e60a98acabb23bf93b6c2a1dea6d 100644 (file)
<input type='text' id="dummy1" name="dummy1" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
{else}
{render acl=$cnACL}
- <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}Posix name of the group{/t}">
+ <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}POSIX name of the group{/t}">
{/render}
{/if}
</td>
<tr>
<td colspan=2>
{render acl=$gidNumberACL}
- <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are autogenerated, select to specify manually{/t}"
+ <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are auto-generated, select to specify manually{/t}"
{$force_gid} onclick="changeState('gidNumber')">
{/render}
<LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
diff --git a/gosa-core/plugins/admin/groups/paste_generic.tpl b/gosa-core/plugins/admin/groups/paste_generic.tpl
index 754eec478534b2fe4678f80aff7bf9168c1be319..499acba811b9c64e49f45074eaa6ec61e5d1ae9a 100644 (file)
{t}Group name{/t}
</td>
<td>
- <input type='text' id='cn' name='cn' size='35' maxlength='60' value='{$cn}' title='{t}Posix name of the group{/t}'>
+ <input type='text' id='cn' name='cn' size='35' maxlength='60' value='{$cn}' title='{t}POSIX name of the group{/t}'>
</td>
</tr>
<tr>
<td>
- <input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are autogenerated, select to specify manually{/t}'
+ <input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are auto-generated, select to specify manually{/t}'
onclick='changeState("gidNumber")'>
<LABEL for='gidNumber'>{t}Force GID{/t}</LABEL>
</td>
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 9f15817e6b603b5b2be63e504be2b98c05b58b6f..69b32e23faa4985ddd01dbe0675214ac70f167b1 100644 (file)
"D" => _("departments"),
"S" => _("servers"),
"W" => _("workstations"),
- "O" => _("winstations"),
+ "O" => _("Windows workstations"),
"T" => _("terminals"),
"F" => _("phones"),
"P" => _("printers"));
/* It has failed, add entry with type flag I (Invalid)*/
if (!$ldap->success()){
- $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".LDAP::fix($dn),"type" => "I");
+ $this->memberList[$dn]= array('text' => _("Non existing DN:")." ".LDAP::fix($dn),"type" => "I");
} else {
"cn" => _("Name"),
"base" => _("Base"),
"description" => _("Description"),
- "accessTo" => _("Sytem trust"),
+ "accessTo" => _("System trust"),
"member" => _("Member"))
));
}
diff --git a/gosa-core/plugins/generic/references/class_reference.inc b/gosa-core/plugins/generic/references/class_reference.inc
index 11a5383b94cebb18883783eacadd22604ce50b4b..f79dec13c6a13b5fe0105253e4c5ff3effd35322 100644 (file)
// Check for user manager
$this->referenceFilters[] = array(
'filter' => "(&(objectClass=gosaAccount)(manager=".normalizeLdap($this->dn)."))",
- 'attrs' => array('givenName' => _("Given name"),'sn' => _("Surname"),'uid'=>_("Uid")),
+ 'attrs' => array('givenName' => _("Given name"),'sn' => _("Surname"),'uid'=>_("UID")),
'msg' => _("User manager"));
// Go through filters and detect possible references
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index f66b36acb513bbd3eca10bbadf05dcef1b5f8094..50d0fd538eead3e273849f84841d649a7288bbb2 100644 (file)
preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)$/', $val)) {
$this->gosaLoginRestrictionWidget->addEntry($val);
} else {
- msg_dialog::display(_("Error"), _("Please add a single IP address or a network/netmask combination!"), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), _("Please add a single IP address or a network/net mask combination!"), ERROR_DIALOG);
}
}
"employeeType" => _("Employee type"),
"roomNumber" => _("Room number"),
- "telephoneNumber" => _("Telefon number"),
+ "telephoneNumber" => _("Telephone number"),
"pager" => _("Pager number"),
"mobile" => _("Mobile number"),
"facsimileTelephoneNumber" => _("Fax number"),
diff --git a/gosa-core/plugins/personal/myaccount/main.inc b/gosa-core/plugins/personal/myaccount/main.inc
index 45d0438c1dee00960b703fc0d0ff6a691ec72cf1..c591fc7b50a0eaa756f57ed67376c09272c16aa7 100644 (file)
$first = $config->data['TABS']['MYACCOUNTTABS'][0];
if(!class_available($first['CLASS'])){
msg_dialog::display(_("Internal error"),
- sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']),
+ sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']),
ERROR_DIALOG);
}else{
diff --git a/gosa-core/plugins/personal/password/changed.tpl b/gosa-core/plugins/personal/password/changed.tpl
index 896501604a5885c473a6880b2e9c2325be467d48..a64cccd826c7ebdb2d7f7b7e1862a95b8d70b455 100644 (file)
<p>
- <b>{t}You've successfully changed your password. Remember to change all programms configured to use it as well.{/t}</b>
+ <b>{t}You've successfully changed your password. Remember to change all programs configured to use it as well.{/t}</b>
</p>
<br>
diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index ccd30a18fc62054c4b6b097d8db51a1b0849655f..d293183a96840ce5ebe623ae5d220e51829f80f7 100644 (file)
_("The password used as new is to short."),WARNING_DIALOG);
}elseif(!passwordMethod::is_harmless($new_password)){
msg_dialog::display(_("Password change"),
- _("The password contains possibly problematic unicode characters!"),WARNING_DIALOG);
+ _("The password contains possibly problematic Unicode characters!"),WARNING_DIALOG);
}elseif($check_hook && $check_hook_output != ""){
msg_dialog::display(_("Password change"),
sprintf(_("External password changer reported a problem: %s."),$check_hook_output),WARNING_DIALOG);
diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index d9de0b94b59ed4be8be1beeef4cb64ef06da9553..e260263bc0b70817587d459eaad01e59679622dd 100644 (file)
</tr>
{if $gotoLastSystemLogin}
<tr>
- <td>{t}Last logon{/t}</td>
+ <td>{t}Last log-on{/t}</td>
<td>{$gotoLastSystemLogin}</td>
</tr>
{/if}
diff --git a/gosa-core/plugins/personal/posix/paste_generic.tpl b/gosa-core/plugins/personal/posix/paste_generic.tpl
index 9ecbb7c4289cd4c18d1822debec1bf0578fd9eae..7ce503598bf8e321e14d15bf246bcacf33e07f58 100644 (file)
-<table width='100%' summary="{t}Posix settings{/t}">
+<table width='100%' summary="{t}POSIX settings{/t}">
<tr>
<td style='width:50%;' class='right-border'>
- <h3>{t}Posix settings{/t}</h3>
+ <h3>{t}POSIX settings{/t}</h3>
<table summary="{t}Home directory{/t}">
<tr>
<td>
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 67336dd701a2f80a65493e6128640d497db0b31d..783ba98fd889f2b6c1333ddae5188a3d73860df2 100644 (file)
/* Is imap module available */
$N = msgPool::checkingFor(_("mbstring"));
- $D = _("GOsa requires this module to handle unicode strings.");
+ $D = _("GOsa requires this module to handle Unicode strings.");
$S = msgPool::installPhpModule("mbstring");
$R = is_callable("mb_strlen");
$M = TRUE;
$N = msgPool::checkingFor(_("samba hash generator"));
$D = _("GOsa requires this command to synchronize POSIX and samba passwords.");
- $S = _("Deploy a gosa-si installation or install the perl Crypt::SmbHash modules.");
+ $S = _("Deploy a gosa-si installation or install the Perl Crypt::SmbHash modules.");
$R = $have_mkntpwd;
$M = TRUE;
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
/* Check if memory limit is set to 32 or > */
$N = "memory_limit >= <b>32</b>";
- $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducable! Increase it for larger setups.");
+ $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducible! Increase it for larger setups.");
$S = _("Search for 'memory_limit' in your php.ini and set it to '32M' or higher.");
$R = ini_get('memory_limit') >= 32 ;
$M = TRUE;
*/
/* Check if we can create a config file.*/
- $N = _("Configuration writeable");
+ $N = _("Configuration writable");
$D = _("The configuration file can't be written");
- $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writeable."),CONFIG_DIR,CONFIG_FILE);
+ $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writable."),CONFIG_DIR,CONFIG_FILE);
$R = ( file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR."/".CONFIG_FILE)) // is there a config file ?
|| (!file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR)); // There is non, but can we create a file there ?
$M = FALSE;
diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index 99055a3c3d62cf6c5914c73eb5491f03b80f2a2a..87fb74788f72e2eb2a970433507f5eb6b089b65e 100644 (file)
$this->features_used['samba'] = array("USED" => isset($oc['sambaSamAccount']) || isset($oc['sambaAccount']) ,
"NAME" => _("Samba management"));
$this->features_used['mail'] = array("USED" => FALSE,
- "NAME" => _("Mailsystem management"));
+ "NAME" => _("Mail system management"));
$this->features_used['fax'] = array("USED" => isset($oc['goFaxAccount']) ,
"NAME" => _("FAX system administration"));
$this->features_used['asterisk'] = array("USED" => isset($oc['goFonAccount']),
$this->features_used['inventory'] = array("USED" => isset($oc['glpiAccount']) ,
"NAME" => _("System inventory"));
$this->features_used['system'] = array("USED" => FALSE ,
- "NAME" => _("System-/Configmanagement"));
+ "NAME" => _("System/Configuration management"));
$this->features_used['addressbook'] = array("USED" => FALSE ,
- "NAME" => _("Addressbook"));
+ "NAME" => _("Address book"));
}
diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc
index aa787833cc73171392ecc6a49587880cc8e143b9..a4c2da751814df94cf11765047718d1f30526df3 100644 (file)
$smarty->assign("CONFIG_DIR",CONFIG_DIR);
$smarty->assign("CONFIG_FILE" , CONFIG_FILE);
- $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the webserver is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
+ $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
$smarty->assign("cv",$this->parent->captured_values);
return($smarty -> fetch (get_template_path("../setup/setup_finish.tpl")));
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 2dc73858609dcc35ab56dae780f2f829dd27c382..84360939770a737ce0ad790f1d9d08abca7d9a89 100644 (file)
$this->checks['permissions']['STATUS'] = FALSE;
$this->checks['permissions']['STATUS_MSG']= _("Failed");
$this->checks['permissions']['ERROR_MSG'] =
- sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+ sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
return(false);
}
$this->checks['permissions']['STATUS'] = FALSE;
$this->checks['permissions']['STATUS_MSG']= _("Failed");
$this->checks['permissions']['ERROR_MSG'] =
- sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+ sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
return(false);
}
/* Create & remove of dummy object was successful */
$this->checks['permissions']['STATUS'] = TRUE;
- $this->checks['permissions']['STATUS_MSG']= _("Ok");
+ $this->checks['permissions']['STATUS_MSG']= _("OK");
$this->checks['permissions']['ERROR_MSG'] = "";
return(true);
}
$str.= "<b>"._("Groups")."</b>: ".trim($valid_groups,", ")."<br>";
}
$this->checks['acls']['STATUS'] = TRUE;
- $this->checks['acls']['STATUS_MSG']= _("Ok");
+ $this->checks['acls']['STATUS_MSG']= _("OK");
$this->checks['acls']['ERROR_MSG'] = $str;
}else{
$this->checks['acls']['STATUS'] = FALSE;
$ldap->cd($cv['base']);
$ldap->search("(uid=".$uid.")");
if($ldap->count()){
- msg_dialog::display(_("Input error"),msgPool::duplicated(_("Uid")), ERROR_DIALOG);
+ msg_dialog::display(_("Input error"),msgPool::duplicated(_("UID")), ERROR_DIALOG);
return false;
}
/* Create & remove of dummy object was successful */
$this->checks['root']['STATUS'] = TRUE;
- $this->checks['root']['STATUS_MSG']= _("Ok");
+ $this->checks['root']['STATUS_MSG']= _("OK");
}
/* Create & remove of dummy object was successful */
$this->checks['rootOC']['STATUS'] = TRUE;
- $this->checks['rootOC']['STATUS_MSG']= _("Ok");
+ $this->checks['rootOC']['STATUS_MSG']= _("OK");
$this->checks['rootOC']['ERROR_MSG'] = "";
}
index ab1dca6647d81b9c591a518d351a2bd27b999410..14d25e2f999ff9c83a8a4335cce5e19cce51e6bd 100644 (file)
<td>{$basic[$key].NAME}</td>
{if $basic[$key].RESULT}
- <td style='color:#0A0'>{t}Ok{/t}</td>
+ <td style='color:#0A0'>{t}OK{/t}</td>
</tr>
{else}
{if $basic[$key].MUST}
<td>{$config[$key].NAME}</td>
{if $config[$key].RESULT}
- <td style='color:#0A0'>{t}Ok{/t}</td>
+ <td style='color:#0A0'>{t}OK{/t}</td>
</tr>
{else}
{if $config[$key].MUST}
index 5fdebc253aa93adb9dd86b75de080c86a47f5c03..f6f103bce117f101d6ce9319d519a4b340b992d1 100644 (file)
{if $feedback_send}
- <font color='green'>{t}Feedback sucessfully send{/t}</font>
+ <font color='green'>{t}Feedback successfully send{/t}</font>
{else}
<input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'>
- {t}Subscribe to the gosa-announce mailinglist{/t}
+ {t}Subscribe to the gosa-announce mailing list{/t}
<p>{t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to subscribe you to the gosa-announce mailing list. You've to confirm this by mail.{/t}</p>
index 9d7597f29635e0cb45406bf0f4e214ed514cf428..b723115fc61c6b915b9fd6f35cbb1361d997af9c 100644 (file)
</p>
{if $webgroup == ""}
-{t}Depending on the user name your webserver is running on:{/t}
+{t}Depending on the user name your web server is running on:{/t}
<tt>
<pre> chown root:www-data {$CONFIG_DIR}/{$CONFIG_FILE}
chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
index 236ce1651f6b607340b58de76653bdb48e0519ca..6681816858d7ffb5285ec7fb43b40f0d90ea193e 100644 (file)
<div class='default'>
<p><b>{t}Please select the preferred language{/t}</b></p>
<p>
- {t}At this point, you can select the site wide default language. Choosing 'automatic' will use the language requested by the browser. This setting can be overriden per user.{/t}
+ {t}At this point, you can select the site wide default language. Choosing 'automatic' will use the language requested by the browser. This setting can be overridden per user.{/t}
</p>
</div>
<div class='default' style='padding-right:10px; margin-bottom:20px;'>
index 97e254cbc6fc9305c9b16b71848028af0b59eb9f..df28d1f976e6eaa11bcbd026d49f2063050c6093 100644 (file)
<b>{t}Authentication{/t}</b>
<table style='width:100%' summary='{t}Authentication{/t}'>
<tr>
- <td style='width:200px;'>{t}Admin DN{/t}</td>
+ <td style='width:200px;'>{t}Administrator DN{/t}</td>
<td>
<input type='text' name='admin_given' maxlength='160' size='40' value='{$admin_given}'>
{if $append_base_to_admin_dn},{$base_to_append}{/if}
<input onClick='document.mainform.submit();'
{if $append_base_to_admin_dn} checked {/if}
type='checkbox' name='append_base_to_admin_dn' value='1'>
- {t}Automatically append LDAP base to admin DN{/t}
+ {t}Automatically append LDAP base to administrator DN{/t}
</td>
</tr>
<tr>
<b>{t}Schema based settings{/t}</b>
<table style='width:100%' summary='{t}Schema based settings{/t}'>
<tr>
- <td style='width:200px;'>{t}Use rfc2307bis compliant groups{/t}</td>
+ <td style='width:200px;'>{t}Use RFC 2307bis compliant groups{/t}</td>
<td>
<select name="rfc2307bis" size="1" title="">
{html_options options=$bool selected=$rfc2307bis}
index c9a0a914471dfc612d03689984fa31c31dabe025..7b65e2804b6476bcc84369caa1083cf07b7dd7c4 100644 (file)
<div>
<p>
- {t}GOsa is developed under the terms of the GNU General Public Licence V2. Please accept the terms below.{/t}
+ {t}GOsa is developed under the terms of the GNU General Public License v2. Please accept the terms below.{/t}
</p>
<div class='default' style='margin:10px; border:1px solid #A0A0A0'>
<div style='height:450px;padding:5px;overflow:auto; '>
index b9fdbb7c6a915dd010c0a127d13ab799502fb0f8..1b0de2e13c19fcd6ab321ada58293a5571540b84 100644 (file)
{if $ocCount == 0}
<p>
- {t}Could not read any schema informations, all checks skipped. Adjust your ldap acls.{/t}
+ {t}Could not read any schema information, all checks skipped. Adjust your LDAP ACLs.{/t}
{if !$database_initialised}
- {t}It seems that your ldap database wasn't initialized yet. This maybe the reason, why GOsa can't read your schema configuration!{/t}
+ {t}It seems that your LDAP database wasn't initialized yet. This maybe the reason, why GOsa can't read your schema configuration!{/t}
{/if}
</p>
{else}
index 7fad847b8cd788d1baae797b371382f742859f6d..861155a97a5a301915e6bae415ab06d04514e7c6 100644 (file)
<div class='default'>
<h2>{t}How to get started{/t}</h2>
<p>
- {t}This seems to be the first time you run GOsa on this system. To start the GOsa web interface you need a working configuration file, which can be generated by this wizzard.{/t}
+ {t}This seems to be the first time you run GOsa on this system. To start the GOsa web interface you need a working configuration file, which can be generated by this wizard.{/t}
</p>
<p>
<ul>
<li>{t}The hostname of your LDAP server{/t}</li>
- <li>{t}Installed GOsa and supplementary schemas{/t}</li>
+ <li>{t}Installed GOsa and supplementary schema{/t}</li>
<li>{t}The LDAP base of your LDAP directory{/t}</li>
- <li>{t}The DN and the password of the LDAP admin user{/t}</li>
+ <li>{t}The DN and the password of the LDAP administration user{/t}</li>
</ul>
<p>