From: cajus Date: Tue, 11 Mar 2008 07:02:45 +0000 (+0000) Subject: Updated strings X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b0c8805b2ffe13f562460936a83fbce9d9ae2499;p=gosa.git Updated strings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9628 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/ihtml/themes/default/accountexpired.tpl b/gosa-core/ihtml/themes/default/accountexpired.tpl index 239b8fc9f..944952b58 100644 --- a/gosa-core/ihtml/themes/default/accountexpired.tpl +++ b/gosa-core/ihtml/themes/default/accountexpired.tpl @@ -12,7 +12,7 @@

- {t}Your Password has expired !! Choose a new Password{/t} + {t}Your Password has expired. Please choose a new one!{/t}

diff --git a/gosa-core/ihtml/themes/default/acl.tpl b/gosa-core/ihtml/themes/default/acl.tpl index 3afb976ea..ec5676cee 100644 --- a/gosa-core/ihtml/themes/default/acl.tpl +++ b/gosa-core/ihtml/themes/default/acl.tpl @@ -1,5 +1,5 @@ {if $dialogState eq 'head'} -

{t}Assigned ACLs for current entry{/t}

+

{t}Assigned ACL for current entry{/t}

{$aclList} {/if} @@ -60,7 +60,7 @@ {if $aclType eq 'base'}

 

-

{t}ACLs for this object{/t}

+

{t}ACL for this object{/t}

{$aclSelector} {/if} diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc index 64f2ab711..afcbb96fd 100644 --- a/gosa-core/include/class_acl.inc +++ b/gosa-core/include/class_acl.inc @@ -426,8 +426,8 @@ class acl extends plugin $field2= array("string" => $this->assembleAclSummary($entry)); $action= ""; $action.= ""; - $action.= ""; - $action.= ""; + $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'"); $aclList->AddEntry(array($field1, $field2, $field3)); @@ -462,15 +462,15 @@ class acl extends plugin /* Set summary... */ if ($summary == ""){ - $summary= ''._("No ACL settings for this category").''; + $summary= ''._("No ACL settings for this category!").''; } else { $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary)); } $field1= array("string" => $dsc, "attach" => "style='width:100px'"); $field2= array("string" => $summary); - $action= ""; - $action.= ""; + $action= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'"); $aclList->AddEntry(array($field1, $field2, $field3)); } @@ -515,7 +515,7 @@ class acl extends plugin } 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' - scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType])); /* Collect objects for selected category */ foreach ($this->ocMapping[$this->aclObject] as $idx => $class){ @@ -662,14 +662,14 @@ class acl extends plugin "\n ". "\n "._("Object").": $name". "\n ". - "\n ". + "\n ". "\n "; } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) { $display.= "\n". "\n ". "\n ". "\n ". + "\n ". "\n "; } else { $display.= "\n
"._("Object").": $name". - "\n
". @@ -823,7 +823,7 @@ class acl extends plugin break; default: - msg_dialog::display(_("Internal error"), sprintf(_("Unkown ACL type '%s'. Don't know how to handle it."), $type), ERROR_DIALOG); + msg_dialog::display(_("Internal error"), sprintf(_("Unkown ACL type '%s'!"), $type), ERROR_DIALOG); $a= array(); } return ($a); @@ -928,7 +928,7 @@ class acl extends plugin if(isset($this->roles[$entry['acl']])){ $summary.= sprintf(_("Role: %s"), $this->roles[$entry['acl']]['cn']); }else{ - $summary.= sprintf(_("Role: %s"), ""._("Unknown role, possibly removed").""); + $summary.= sprintf(_("Role: %s"), ""._("unknown role").""); } }else{ foreach ($entry['acl'] as $name => $object){ @@ -945,13 +945,13 @@ class acl extends plugin $summary.= ", "; } if (count($entry['members'])){ - $summary.= _("Members:")." "; + $summary.= _("Members").": "; foreach ($entry['members'] as $cn){ $cn= preg_replace('/ \[.*$/', '', $cn); $summary.= $cn.", "; } } else { - $summary.= _("ACL is valid for all users"); + $summary.= _("ACL takes effect for all users"); } return (preg_replace('/, $/', '', $summary)); diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index a8e8c29f0..77cc8fd6a 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -617,7 +617,7 @@ function add_lock ($object, $user) $attrs["cn"] = "$name"; $ldap->add($attrs); if (!$ldap->success()){ - msg_dialog::display(_("Internal error"), sprintf(_("Adding a lock failed.")."

"._('LDAP server returned: %s'), "

".$ldap->get_error().""), ERROR_DIALOG); + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "cn=$name,".$config->current['CONFIG'], 0, ERROR_DIALOG)); return; } } diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po index 3b57f755e..959dcfe82 100644 --- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2008-03-04 08:41+0100\n" "Last-Translator: Cajus Pollmeier \n" "Language-Team: \n" @@ -196,7 +196,8 @@ msgstr "Verfügbare Mitglieder" msgid "List message possible targets" msgstr "Zeige mögliche Empfänger dieser Nachricht" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "Mitglieder" @@ -920,13 +921,6 @@ msgstr "" "Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle " "Programme anzupassen, die dieses Passwort auch benutzen." -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Zurück" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1083,11 +1077,11 @@ msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar." #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 msgid "LDAP error" msgstr "LDAP-Fehler" @@ -1606,17 +1600,22 @@ msgid "grace time active" msgstr "Nachfrist aktiv" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "aktiv, Passwort kann nicht geändert werden" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "aktiv, Passwort abgelaufen" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "aktiv" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "aktiv, Passwort kann nicht geändert werden" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "aktiv, Passwort abgelaufen" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "unkonfiguriert" @@ -2015,7 +2014,8 @@ msgid "Template" msgstr "Vorlage" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Bearbeiten" @@ -2132,12 +2132,9 @@ msgid "Copy this entry" msgstr "Diesen Eintrag kopieren" #: plugins/admin/users/class_divListUsers.inc:318 -msgid "Deactivated" -msgstr "Abgeschaltet" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" -msgstr "Aktiv" +#, fuzzy +msgid "inactive" +msgstr "aktiv" #: plugins/admin/users/class_divListUsers.inc:328 #: plugins/admin/ogroups/class_divListOGroup.inc:283 @@ -2146,14 +2143,14 @@ msgstr "Aktiv" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "Bearbeiten" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "Benutzer bearbeiten" +#, fuzzy +msgid "user" +msgstr "Benutzer" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2170,8 +2167,7 @@ msgstr "Sie haben keine Berechtigung, das Passwort dieses Benutzers zu ändern." #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "Entfernen" @@ -2433,10 +2429,6 @@ msgstr "Telefone" msgid "printers" msgstr "Drucker" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "und" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "Unbekannte dn:" @@ -2747,6 +2739,12 @@ msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "" "Sie sind dabei, einen gesamten LDAP-Teilbaum unterhalb von '%s' zu löschen." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Zurück" + #: plugins/admin/departments/tabs_department.inc:55 msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" msgstr "" @@ -2943,17 +2941,23 @@ msgstr "" "gewünschte Operation durchzuführen." #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" -msgstr "ACL" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "Zugriffsregeln" #: plugins/admin/acl/class_aclRole.inc:26 -msgid "Access control list templates" -msgstr "Vorlagen für Zugriffskontrollisten" +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 +#, fuzzy +msgid "Access control roles" +msgstr "Zugriffskontrollliste" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "ACL-Rollen" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -2991,15 +2995,15 @@ msgstr "Auf" msgid "Down" msgstr "Ab" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 msgid "Edit ACL" msgstr "ACL Bearbeiten" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 msgid "Delete ACL" msgstr "ACL Entfernen" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "Keine ACL-Einstellungen für diese Kategorie" @@ -3008,15 +3012,15 @@ msgstr "Keine ACL-Einstellungen für diese Kategorie" msgid "Contains ACLs for these objects: %s" msgstr "Enthält ACLs für diese Objekte: %s" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 msgid "Edit categories ACLs" msgstr "ACLs dieser Kategorie bearbeiten" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "ACLs dieser Kategorie leeren" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'" @@ -3036,14 +3040,6 @@ msgstr "" "Die Rolle kann nicht entfernt werden, solange sie noch von folgenden " "Objekten verwendet wird:" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -msgid "ACL roles" -msgstr "ACL-Rollen" - -#: plugins/admin/acl/class_aclRole.inc:700 -msgid "Acl roles" -msgstr "ACL-Rollen" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -5103,11 +5099,6 @@ msgstr "%s%% Trefferquote in Datei %s" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "Zugriffsregeln" - #: include/class_tabs.inc:346 msgid "References" msgstr "Referenzen" @@ -5277,11 +5268,10 @@ msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 msgid "Internal error" msgstr "Interner Fehler" @@ -5412,8 +5402,30 @@ msgstr "Zugriffskontrolle" msgid "Use ACL defined in role" msgstr "Verwende ACL aus Rollendefinition" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Entfernen" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "Keine ACL-Einstellungen für diese Kategorie" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Kategorie" + +#: include/class_acl.inc:518 +#, fuzzy, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'" + #: include/class_acl.inc:665 include/class_acl.inc:672 -msgid "Show/Hide Advanced Settings" +#, fuzzy +msgid "Show/hide advanced settings" msgstr "Zeige/Verstecke Erweiterte Einstellungen" #: include/class_acl.inc:690 @@ -5453,9 +5465,9 @@ msgid "Complete object" msgstr "Vollständiges Objekt" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "Unbekannter ACL-Typ '%s'. Verarbeitung nicht möglich." +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "Unbekannter Eintrag '%s'!" #: include/class_acl.inc:869 #, php-format @@ -5468,26 +5480,28 @@ msgid "Role: %s" msgstr "Rolle: %s" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "Unbekannte Rolle, möglicherweise wurde sie entfernt" +#, fuzzy +msgid "unknown role" +msgstr "! unbekannte id" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "Enthält Einstellungen für diese Objekte: %s" -#: include/class_acl.inc:948 -msgid "Members:" -msgstr "Mitglieder:" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +#, fuzzy +msgid "ACL takes effect for all users" msgstr "ACL ist gültig für alle Benutzer" #: include/class_acl.inc:1115 msgid "Access control list" msgstr "Zugriffskontrollliste" +#: include/class_acl.inc:1120 +msgid "ACL roles" +msgstr "ACL-Rollen" + #: include/class_acl.inc:1123 msgid "Role name" msgstr "Rollenname" @@ -5623,16 +5637,11 @@ msgstr "" "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie " "Ihren Administrator!" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, php-format msgid "LDAP server returned: %s" msgstr "Der LDAP-Server meldete: %s" -#: include/functions.inc:620 -#, php-format -msgid "Adding a lock failed." -msgstr "Hinzufügen der Sperre ist fehlgeschlagen" - #: include/functions.inc:699 msgid "" "Found multiple locks for object to be locked. This should not happen - " @@ -6151,11 +6160,6 @@ msgstr "Hinzufügen" msgid "Add %s" msgstr "Hinzufügen" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Entfernen" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6714,6 +6718,39 @@ msgstr "" "Auf das Hilfeverzeichnis '%s' kann nicht zugegriffen werden - kann daher " "keine Hilfedateien lesen." +#~ msgid "Deactivated" +#~ msgstr "Abgeschaltet" + +#~ msgid "Active" +#~ msgstr "Aktiv" + +#~ msgid "Edit user" +#~ msgstr "Benutzer bearbeiten" + +#~ msgid "and" +#~ msgstr "und" + +#~ msgid "Unkown ACL type '%s'. Don't know how to handle it." +#~ msgstr "Unbekannter ACL-Typ '%s'. Verarbeitung nicht möglich." + +#~ msgid "Unknown role, possibly removed" +#~ msgstr "Unbekannte Rolle, möglicherweise wurde sie entfernt" + +#~ msgid "Members:" +#~ msgstr "Mitglieder:" + +#~ msgid "Adding a lock failed." +#~ msgstr "Hinzufügen der Sperre ist fehlgeschlagen" + +#~ msgid "Acl" +#~ msgstr "ACL" + +#~ msgid "Access control list templates" +#~ msgstr "Vorlagen für Zugriffskontrollisten" + +#~ msgid "Acl roles" +#~ msgstr "ACL-Rollen" + #~ msgid "User login failed." #~ msgstr "Benutzeranmeldung fehlgeschlagen." diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po index ca622c62b..0a560198f 100644 --- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: admin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2007-07-24 00:26+0200\n" "Last-Translator: ALEJANDRO ESCANERO BLANCO\n" "Language-Team: \n" @@ -180,7 +180,8 @@ msgstr "" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "" @@ -857,13 +858,6 @@ msgid "" "configured to use it as well." msgstr "" -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Atrás" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1017,11 +1011,11 @@ msgstr "La aplicación ya no está disponible." #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "Servicio LDAP" @@ -1539,17 +1533,22 @@ msgid "grace time active" msgstr "Periodo de gracia activado" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "activo, no puede cambiar la contraseña" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "activo, la contraseña expiró" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "activo" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "activo, no puede cambiar la contraseña" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "activo, la contraseña expiró" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "Sin configurar" @@ -1945,7 +1944,8 @@ msgid "Template" msgstr "Plantilla" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Editar" @@ -2065,12 +2065,8 @@ msgstr "Copiar esta entrada" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Activado" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" -msgstr "" +msgid "inactive" +msgstr "activo" #: plugins/admin/users/class_divListUsers.inc:328 #: plugins/admin/ogroups/class_divListOGroup.inc:283 @@ -2079,14 +2075,14 @@ msgstr "" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "editar" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "Editar usuario" +#, fuzzy +msgid "user" +msgstr "Usuario" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2103,8 +2099,7 @@ msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "eliminar" @@ -2366,10 +2361,6 @@ msgstr "" msgid "printers" msgstr "" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "" @@ -2677,6 +2668,12 @@ msgstr "Has decidido eliminar las siguientes entradas %s" msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "Ha decidido eliminar todo el subárbol LDAP colocado debajo de '%s'." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Atrás" + #: plugins/admin/departments/tabs_department.inc:55 #, fuzzy msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" @@ -2862,17 +2859,23 @@ msgid "" msgstr "" #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" -msgstr "Acl" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "ACL" #: plugins/admin/acl/class_aclRole.inc:26 -msgid "Access control list templates" -msgstr "" +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 +#, fuzzy +msgid "Access control roles" +msgstr "Lista de control de acceso" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "Rol" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -2910,15 +2913,15 @@ msgstr "Arriba" msgid "Down" msgstr "Abajo" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 msgid "Edit ACL" msgstr "Editar ACL" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 msgid "Delete ACL" msgstr "Eliminar ACL" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "No hay ACL configuradas en esta categoría" @@ -2927,15 +2930,15 @@ msgstr "No hay ACL configuradas en esta categoría" msgid "Contains ACLs for these objects: %s" msgstr "ACLs que tienen estos objetos: %s" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 msgid "Edit categories ACLs" msgstr "Editar las categorías ACLs" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "Eliminar categorías ACLs" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "Editar ACL para '%s', el ámbito es '%s'" @@ -2956,14 +2959,6 @@ msgstr "" "Este Rol no puede ser eliminado por estar siendo usado. Los siguientes " "objetos están usando este rol %s" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -msgid "ACL roles" -msgstr "Rol" - -#: plugins/admin/acl/class_aclRole.inc:700 -msgid "Acl roles" -msgstr "Roles" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -4961,11 +4956,6 @@ msgstr "" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "ACL" - #: include/class_tabs.inc:346 msgid "References" msgstr "" @@ -5118,11 +5108,10 @@ msgstr "" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5250,8 +5239,29 @@ msgstr "" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Eliminar" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "No hay ACL configuradas en esta categoría" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Categoría" + +#: include/class_acl.inc:518 +#, fuzzy, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "Editar ACL para '%s', el ámbito es '%s'" + #: include/class_acl.inc:665 include/class_acl.inc:672 -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "" #: include/class_acl.inc:690 @@ -5292,7 +5302,7 @@ msgstr "" #: include/class_acl.inc:826 #, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." +msgid "Unkown ACL type '%s'!" msgstr "" #: include/class_acl.inc:869 @@ -5306,26 +5316,27 @@ msgid "Role: %s" msgstr "" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "" +#, fuzzy +msgid "unknown role" +msgstr "¡id desconocido!" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "" -#: include/class_acl.inc:948 -msgid "Members:" -msgstr "" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 msgid "Access control list" msgstr "Lista de control de acceso" +#: include/class_acl.inc:1120 +msgid "ACL roles" +msgstr "Rol" + #: include/class_acl.inc:1123 msgid "Role name" msgstr "Nombre del Rol" @@ -5442,16 +5453,11 @@ msgid "" "administrator!" msgstr "" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, php-format msgid "LDAP server returned: %s" msgstr "" -#: include/functions.inc:620 -#, php-format -msgid "Adding a lock failed." -msgstr "" - #: include/functions.inc:699 msgid "" "Found multiple locks for object to be locked. This should not happen - " @@ -5926,11 +5932,6 @@ msgstr "Añadir" msgid "Add %s" msgstr "Añadir" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Eliminar" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6481,6 +6482,19 @@ msgstr "" msgid "Helpdir '%s' is not accessible, can't read any helpfiles." msgstr "" +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Activado" + +#~ msgid "Edit user" +#~ msgstr "Editar usuario" + +#~ msgid "Acl" +#~ msgstr "Acl" + +#~ msgid "Acl roles" +#~ msgstr "Roles" + #, fuzzy #~ msgid "Removing a lock failed." #~ msgstr "Ha fallado la eliminación del antiguo archivo ppd'%s'." diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po index 6a21bc6fe..68800db75 100644 --- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2007-07-19 11:57+0200\n" "Last-Translator: Benoit Mortier \n" "Language-Team: Français \n" @@ -189,7 +189,8 @@ msgstr "Membres disponibles" msgid "List message possible targets" msgstr "Liste les destinataires possibles pour les messages" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "Membres" @@ -921,13 +922,6 @@ msgstr "" "Votre mot de passe a été changé. N'oubliez pas de modifier les programmes " "qui l'utilisent." -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Retour" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1086,11 +1080,11 @@ msgstr "L'application sélectionnée n'est plus disponible." #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "Erreur LDAP :" @@ -1611,17 +1605,22 @@ msgid "grace time active" msgstr "temps de grâce activé" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "actif, impossible de changer le mot de passe" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "actif, mot de passe expiré" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "actif" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "actif, impossible de changer le mot de passe" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "actif, mot de passe expiré" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "non configuré" @@ -2019,7 +2018,8 @@ msgid "Template" msgstr "Modèle" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Editer" @@ -2139,12 +2139,8 @@ msgstr "Copier cette entrée" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Activé" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" -msgstr "Actif" +msgid "inactive" +msgstr "actif" #: plugins/admin/users/class_divListUsers.inc:328 #: plugins/admin/ogroups/class_divListOGroup.inc:283 @@ -2153,14 +2149,14 @@ msgstr "Actif" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "éditer" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "Editer un utilisateur" +#, fuzzy +msgid "user" +msgstr "utilisateurs" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2178,8 +2174,7 @@ msgstr "" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "supprimer" @@ -2453,10 +2448,6 @@ msgstr "téléphones" msgid "printers" msgstr "imprimantes" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "et" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "le dn n'existe pas:" @@ -2773,6 +2764,12 @@ msgstr "" "Vous êtes sur le point de supprimer la branche complète de l'annuaire LDAP " "placé sous '%s'." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Retour" + #: plugins/admin/departments/tabs_department.inc:55 #, fuzzy msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" @@ -2973,17 +2970,23 @@ msgstr "" "effectuer l'opération demandée." #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" msgstr "" #: plugins/admin/acl/class_aclRole.inc:26 -msgid "Access control list templates" -msgstr "Liste des modèles de contrôle d'accès" +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 +#, fuzzy +msgid "Access control roles" +msgstr "Contrôle d'accès (ACL)" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "Rôles ACL" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -3021,15 +3024,15 @@ msgstr "Au dessus" msgid "Down" msgstr "En bas" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 msgid "Edit ACL" msgstr "Editer l'ACL" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 msgid "Delete ACL" msgstr "Effacer L'ACL" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "Pas d'ACL pour cette catégorie" @@ -3038,15 +3041,15 @@ msgstr "Pas d'ACL pour cette catégorie" msgid "Contains ACLs for these objects: %s" msgstr "Contient les ACL pour ces objets: %s" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 msgid "Edit categories ACLs" msgstr "Editer les catégories d'ACL" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "Effacer les catégories d'ACL" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "Editer l'ACL pour '%s', l'étendue est '%s'" @@ -3067,14 +3070,6 @@ msgstr "" "Ce rôle ne peut pas être supprimé car il est encore utilisé. Les objects " "suivants %s utilisent ce rôle" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -msgid "ACL roles" -msgstr "Rôles ACL" - -#: plugins/admin/acl/class_aclRole.inc:700 -msgid "Acl roles" -msgstr "Rôles ACL" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -5167,11 +5162,6 @@ msgstr "%s%% de correspondance dans le fichier %s" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "L'effacement à été interrompu par l'extension '%s': %s" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "" - #: include/class_tabs.inc:346 msgid "References" msgstr "Références" @@ -5334,11 +5324,10 @@ msgstr "SID et/ou RIDBASE absents dans votre configuration !" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5473,8 +5462,30 @@ msgstr "Contrôle d'accès" msgid "Use ACL defined in role" msgstr "Utiliser l'ACL définie dans le rôle" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Supprimer" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "Pas d'ACL pour cette catégorie" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Catégorie" + +#: include/class_acl.inc:518 +#, fuzzy, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "Editer l'ACL pour '%s', l'étendue est '%s'" + #: include/class_acl.inc:665 include/class_acl.inc:672 -msgid "Show/Hide Advanced Settings" +#, fuzzy +msgid "Show/hide advanced settings" msgstr "Afficher/Cacher la configuration avancée" #: include/class_acl.inc:690 @@ -5514,9 +5525,9 @@ msgid "Complete object" msgstr "L'objet au complet" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "Type d'ACL inconnu '%s'. je ne sais pas comment l'utiliser." +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "Entrée inconnue '%s' !" #: include/class_acl.inc:869 #, php-format @@ -5529,26 +5540,28 @@ msgid "Role: %s" msgstr "Rôle : %s" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "Rôle inconnu, probablement enlevé" +#, fuzzy +msgid "unknown role" +msgstr "! identifiant inconnu" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "Contient les paramètres pour ces objets: %s" -#: include/class_acl.inc:948 -msgid "Members:" -msgstr "Membres:" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +#, fuzzy +msgid "ACL takes effect for all users" msgstr "ACL valide pour tout les utilisateurs" #: include/class_acl.inc:1115 msgid "Access control list" msgstr "Contrôle d'accès (ACL)" +#: include/class_acl.inc:1120 +msgid "ACL roles" +msgstr "Rôles ACL" + #: include/class_acl.inc:1123 msgid "Role name" msgstr "Nom du rôle" @@ -5677,16 +5690,11 @@ msgstr "" "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. " "Veuillez vérifier l'entrée 'config' dans gosa.conf !" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, fuzzy, php-format msgid "LDAP server returned: %s" msgstr "Serveur LDAP" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "Echec lors de l'ajout d'un verrou. Le serveur LDAP répond '%s'." - #: include/functions.inc:699 #, fuzzy msgid "" @@ -6188,11 +6196,6 @@ msgstr "Ajouter" msgid "Add %s" msgstr "Ajouter" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Supprimer" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6763,6 +6766,38 @@ msgstr "" "Le répertoire d'aide '%s' n'est pas accessible, impossible de lire les " "fichiers d'aide." +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Activé" + +#~ msgid "Active" +#~ msgstr "Actif" + +#~ msgid "Edit user" +#~ msgstr "Editer un utilisateur" + +#~ msgid "and" +#~ msgstr "et" + +#~ msgid "Unkown ACL type '%s'. Don't know how to handle it." +#~ msgstr "Type d'ACL inconnu '%s'. je ne sais pas comment l'utiliser." + +#~ msgid "Unknown role, possibly removed" +#~ msgstr "Rôle inconnu, probablement enlevé" + +#~ msgid "Members:" +#~ msgstr "Membres:" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "Echec lors de l'ajout d'un verrou. Le serveur LDAP répond '%s'." + +#~ msgid "Access control list templates" +#~ msgstr "Liste des modèles de contrôle d'accès" + +#~ msgid "Acl roles" +#~ msgstr "Rôles ACL" + #, fuzzy #~ msgid "User login failed." #~ msgstr "Echec de l'authentification. Le serveur LDAP répond '%s'." diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po index e7c64483b..9e41e7e03 100644 --- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2005-11-18 15:26+0100\n" "Last-Translator: Alessandro Amici \n" "Language-Team: Italian\n" @@ -189,7 +189,8 @@ msgstr "" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "Membri" @@ -888,13 +889,6 @@ msgstr "" "Hai cambiato con successo la tua password. Ricorda di cambiare tutto i " "programmmi configurati per usarla." -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Indietro" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1051,11 +1045,11 @@ msgstr "" #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "Errore LDAP" @@ -1597,21 +1591,24 @@ msgstr "Esporta" msgid "grace time active" msgstr "" +#: plugins/personal/posix/class_posixAccount.inc:159 +#: plugins/personal/posix/class_posixAccount.inc:161 +#: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 +#, fuzzy +msgid "active" +msgstr "Privato" + #: plugins/personal/posix/class_posixAccount.inc:159 #, fuzzy -msgid "active, password not changable" +msgid "password not changable" msgstr "Nuova password" #: plugins/personal/posix/class_posixAccount.inc:161 #, fuzzy -msgid "active, password expired" +msgid "password expired" msgstr "La password spira il" -#: plugins/personal/posix/class_posixAccount.inc:163 -#, fuzzy -msgid "active" -msgstr "Privato" - #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "non configurata" @@ -2017,7 +2014,8 @@ msgid "Template" msgstr "" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Modifica" @@ -2152,12 +2150,7 @@ msgstr "Modifica questo record" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Privato" - -#: plugins/admin/users/class_divListUsers.inc:321 -#, fuzzy -msgid "Active" +msgid "inactive" msgstr "Privato" #: plugins/admin/users/class_divListUsers.inc:328 @@ -2167,15 +2160,14 @@ msgstr "Privato" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "modifica" #: plugins/admin/users/class_divListUsers.inc:329 #, fuzzy -msgid "Edit user" -msgstr "Modifica contatto" +msgid "user" +msgstr "utenti" #: plugins/admin/users/class_divListUsers.inc:338 #, fuzzy @@ -2194,8 +2186,7 @@ msgstr "Non hai il permesso di cambiare la tua password." #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "elimina" @@ -2459,10 +2450,6 @@ msgstr "telefoni" msgid "printers" msgstr "stampanti" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "e" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "" @@ -2790,6 +2777,12 @@ msgstr "Non hai il permesso di cambiare la tua password." msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "" +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Indietro" + #: plugins/admin/departments/tabs_department.inc:55 msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" msgstr "" @@ -2973,18 +2966,23 @@ msgid "" msgstr "" #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" -msgstr "" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "ACL" #: plugins/admin/acl/class_aclRole.inc:26 +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 #, fuzzy -msgid "Access control list templates" +msgid "Access control roles" msgstr "Opzioni di accesso" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "ACL" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -3026,17 +3024,17 @@ msgstr "" msgid "Down" msgstr "Dominio" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 #, fuzzy msgid "Edit ACL" msgstr "Modifica" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 #, fuzzy msgid "Delete ACL" msgstr "Rimuovi" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 #, fuzzy msgid "No ACL settings for this category" msgstr "Nome descrittivo del gruppo" @@ -3046,16 +3044,16 @@ msgstr "Nome descrittivo del gruppo" msgid "Contains ACLs for these objects: %s" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 #, fuzzy msgid "Edit categories ACLs" msgstr "classe" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "" @@ -3074,16 +3072,6 @@ msgstr "Nome dell'oggetto" msgid "This role cannot be removed while it is in use by these objects:" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -#, fuzzy -msgid "ACL roles" -msgstr "ACL" - -#: plugins/admin/acl/class_aclRole.inc:700 -#, fuzzy -msgid "Acl roles" -msgstr "Riferimenti" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -5218,11 +5206,6 @@ msgstr "" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "ACL" - #: include/class_tabs.inc:346 msgid "References" msgstr "Riferimenti" @@ -5383,11 +5366,10 @@ msgstr "" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5514,9 +5496,30 @@ msgstr "Opzioni di accesso" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Rimuovi" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "Nome descrittivo del gruppo" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "classe" + +#: include/class_acl.inc:518 +#, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "" + #: include/class_acl.inc:665 include/class_acl.inc:672 #, fuzzy -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "Opzioni di posta avanzate" #: include/class_acl.inc:690 @@ -5563,7 +5566,7 @@ msgstr "Gruppo di oggetti" #: include/class_acl.inc:826 #, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." +msgid "Unkown ACL type '%s'!" msgstr "" #: include/class_acl.inc:869 @@ -5577,7 +5580,7 @@ msgid "Role: %s" msgstr "Ruolo" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" +msgid "unknown role" msgstr "" #: include/class_acl.inc:939 @@ -5585,13 +5588,8 @@ msgstr "" msgid "Contains settings for these objects: %s" msgstr "Nome descrittivo del gruppo" -#: include/class_acl.inc:948 -#, fuzzy -msgid "Members:" -msgstr "Membri" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 @@ -5599,6 +5597,11 @@ msgstr "" msgid "Access control list" msgstr "Opzioni di accesso" +#: include/class_acl.inc:1120 +#, fuzzy +msgid "ACL roles" +msgstr "ACL" + #: include/class_acl.inc:1123 #, fuzzy msgid "Role name" @@ -5722,16 +5725,11 @@ msgid "" msgstr "" "Errore di connessione al server LDAP. Contatta l'amministratore del sistema." -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, php-format msgid "LDAP server returned: %s" msgstr "" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "Imposta dipartimento" - #: include/functions.inc:699 msgid "" "Found multiple locks for object to be locked. This should not happen - " @@ -6207,11 +6205,6 @@ msgstr "Aggiungi" msgid "Add %s" msgstr "Aggiungi" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Rimuovi" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6766,6 +6759,37 @@ msgstr "" msgid "Helpdir '%s' is not accessible, can't read any helpfiles." msgstr "" +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Privato" + +#, fuzzy +#~ msgid "Active" +#~ msgstr "Privato" + +#, fuzzy +#~ msgid "Edit user" +#~ msgstr "Modifica contatto" + +#~ msgid "and" +#~ msgstr "e" + +#, fuzzy +#~ msgid "Members:" +#~ msgstr "Membri" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "Imposta dipartimento" + +#, fuzzy +#~ msgid "Access control list templates" +#~ msgstr "Opzioni di accesso" + +#, fuzzy +#~ msgid "Acl roles" +#~ msgstr "Riferimenti" + #, fuzzy #~ msgid "User login failed." #~ msgstr "Nome applicazione" diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po index 6fadf6030..0054a755d 100644 --- a/gosa-core/locale/core/messages.po +++ b/gosa-core/locale/core/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -179,7 +179,8 @@ msgstr "" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "" @@ -838,13 +839,6 @@ msgid "" "configured to use it as well." msgstr "" -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -992,11 +986,11 @@ msgstr "" #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 msgid "LDAP error" msgstr "" @@ -1511,15 +1505,18 @@ msgid "grace time active" msgstr "" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" +#: plugins/personal/posix/class_posixAccount.inc:161 +#: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 +msgid "active" msgstr "" -#: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" +#: plugins/personal/posix/class_posixAccount.inc:159 +msgid "password not changable" msgstr "" -#: plugins/personal/posix/class_posixAccount.inc:163 -msgid "active" +#: plugins/personal/posix/class_posixAccount.inc:161 +msgid "password expired" msgstr "" #: plugins/personal/posix/class_posixAccount.inc:208 @@ -1906,7 +1903,8 @@ msgid "Template" msgstr "" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "" @@ -2023,11 +2021,7 @@ msgid "Copy this entry" msgstr "" #: plugins/admin/users/class_divListUsers.inc:318 -msgid "Deactivated" -msgstr "" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" +msgid "inactive" msgstr "" #: plugins/admin/users/class_divListUsers.inc:328 @@ -2037,13 +2031,12 @@ msgstr "" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" +msgid "user" msgstr "" #: plugins/admin/users/class_divListUsers.inc:338 @@ -2061,8 +2054,7 @@ msgstr "" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "" @@ -2310,10 +2302,6 @@ msgstr "" msgid "printers" msgstr "" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "" @@ -2618,6 +2606,12 @@ msgstr "" msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "" +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "" + #: plugins/admin/departments/tabs_department.inc:55 msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" msgstr "" @@ -2797,16 +2791,21 @@ msgid "" msgstr "" #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" msgstr "" #: plugins/admin/acl/class_aclRole.inc:26 -msgid "Access control list templates" +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 +msgid "Access control roles" msgstr "" #: plugins/admin/acl/class_aclRole.inc:27 -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -2844,15 +2843,15 @@ msgstr "" msgid "Down" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 msgid "Edit ACL" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 msgid "Delete ACL" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "" @@ -2861,15 +2860,15 @@ msgstr "" msgid "Contains ACLs for these objects: %s" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 msgid "Edit categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "" @@ -2887,14 +2886,6 @@ msgstr "" msgid "This role cannot be removed while it is in use by these objects:" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -msgid "ACL roles" -msgstr "" - -#: plugins/admin/acl/class_aclRole.inc:700 -msgid "Acl roles" -msgstr "" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -4768,11 +4759,6 @@ msgstr "" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "" - #: include/class_tabs.inc:346 msgid "References" msgstr "" @@ -4925,11 +4911,10 @@ msgstr "" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 msgid "Internal error" msgstr "" @@ -5053,8 +5038,27 @@ msgstr "" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "" + +#: include/class_acl.inc:465 +msgid "No ACL settings for this category!" +msgstr "" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +msgid "category ACL" +msgstr "" + +#: include/class_acl.inc:518 +#, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "" + #: include/class_acl.inc:665 include/class_acl.inc:672 -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "" #: include/class_acl.inc:690 @@ -5095,7 +5099,7 @@ msgstr "" #: include/class_acl.inc:826 #, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." +msgid "Unkown ACL type '%s'!" msgstr "" #: include/class_acl.inc:869 @@ -5109,7 +5113,7 @@ msgid "Role: %s" msgstr "" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" +msgid "unknown role" msgstr "" #: include/class_acl.inc:939 @@ -5117,18 +5121,18 @@ msgstr "" msgid "Contains settings for these objects: %s" msgstr "" -#: include/class_acl.inc:948 -msgid "Members:" -msgstr "" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 msgid "Access control list" msgstr "" +#: include/class_acl.inc:1120 +msgid "ACL roles" +msgstr "" + #: include/class_acl.inc:1123 msgid "Role name" msgstr "" @@ -5245,16 +5249,11 @@ msgid "" "administrator!" msgstr "" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, php-format msgid "LDAP server returned: %s" msgstr "" -#: include/functions.inc:620 -#, php-format -msgid "Adding a lock failed." -msgstr "" - #: include/functions.inc:699 msgid "" "Found multiple locks for object to be locked. This should not happen - " @@ -5707,11 +5706,6 @@ msgstr "" msgid "Add %s" msgstr "" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "" - #: include/utils/class_msgPool.inc:262 #, php-format msgid "Delete %s" diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po index a6d2cc1eb..707104051 100644 --- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2006-06-02 16:58+0100\n" "Last-Translator: Niels Klomp (CareWorks ICT Services) \n" "Language-Team: CareWorks ICT Services \n" @@ -199,7 +199,8 @@ msgstr "" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "Groepsleden" @@ -919,13 +920,6 @@ msgstr "" "U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle " "programma's die dit wachtwoord gebruiken ook aanpast!" -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Terug" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1083,11 +1077,11 @@ msgstr "Dit programma is niet meer beschikbaar." #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "LDAP fout:" @@ -1622,17 +1616,22 @@ msgid "grace time active" msgstr "gratie tijd actief" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "actief, wachtwoord onveranderbaar" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "actief, wachtwoord verlopen" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "actief" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "actief, wachtwoord onveranderbaar" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "actief, wachtwoord verlopen" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "niet geconfigureerd" @@ -2037,7 +2036,8 @@ msgid "Template" msgstr "Sjabloon" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Bewerken" @@ -2157,12 +2157,8 @@ msgstr "Deze invoer kopieren" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Geactiveerd" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" -msgstr "Actief" +msgid "inactive" +msgstr "actief" #: plugins/admin/users/class_divListUsers.inc:328 #: plugins/admin/ogroups/class_divListOGroup.inc:283 @@ -2171,14 +2167,14 @@ msgstr "Actief" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "Bewerk" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "Bewerk gebruiker" +#, fuzzy +msgid "user" +msgstr "gebruikers" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2196,8 +2192,7 @@ msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "Verwijder" @@ -2471,10 +2466,6 @@ msgstr "telefoons" msgid "printers" msgstr "printers" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "en" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "Niet bestaande dn: " @@ -2790,6 +2781,12 @@ msgstr "U staat op het punt de invoer %s te verwijderen." msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Terug" + #: plugins/admin/departments/tabs_department.inc:55 #, fuzzy msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" @@ -2985,19 +2982,23 @@ msgstr "" "de gewenste opdracht uit te voeren." #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -#, fuzzy -msgid "Acl" -msgstr "Alle" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "Rechten" #: plugins/admin/acl/class_aclRole.inc:26 +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 #, fuzzy -msgid "Access control list templates" +msgid "Access control roles" msgstr "Toegangsopties" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "Rechten" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -3039,17 +3040,17 @@ msgstr "Omhoog" msgid "Down" msgstr "Omlaag" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 #, fuzzy msgid "Edit ACL" msgstr "Bewerken" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 #, fuzzy msgid "Delete ACL" msgstr "Verwijderen" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "" @@ -3058,16 +3059,16 @@ msgstr "" msgid "Contains ACLs for these objects: %s" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 #, fuzzy msgid "Edit categories ACLs" msgstr "Bewerk klasse" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "" @@ -3086,16 +3087,6 @@ msgstr "Objectnaam" msgid "This role cannot be removed while it is in use by these objects:" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -#, fuzzy -msgid "ACL roles" -msgstr "Rechten" - -#: plugins/admin/acl/class_aclRole.inc:700 -#, fuzzy -msgid "Acl roles" -msgstr "Nieuw profiel" - #: plugins/admin/acl/remove.tpl:6 #, fuzzy msgid "" @@ -5273,11 +5264,6 @@ msgstr "%s%% resultaat in bestand %s" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "Rechten" - #: include/class_tabs.inc:346 msgid "References" msgstr "Referenties" @@ -5444,11 +5430,10 @@ msgstr "SID en/of RIDBASE ontbreken in uw configuratie!" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5577,9 +5562,29 @@ msgstr "Toegangsopties" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Verwijderen" + +#: include/class_acl.inc:465 +msgid "No ACL settings for this category!" +msgstr "" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Categorie" + +#: include/class_acl.inc:518 +#, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "" + #: include/class_acl.inc:665 include/class_acl.inc:672 #, fuzzy -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "Geavanceerde telefoon instellingen" #: include/class_acl.inc:690 @@ -5625,9 +5630,9 @@ msgid "Complete object" msgstr "Nieuw FAI object aanmaken" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "" +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "Onbekende FAI status %s" #: include/class_acl.inc:869 #, fuzzy, php-format @@ -5640,21 +5645,17 @@ msgid "Role: %s" msgstr "Funktie" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "" +#, fuzzy +msgid "unknown role" +msgstr "! onbekend id" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "" -#: include/class_acl.inc:948 -#, fuzzy -msgid "Members:" -msgstr "Groepsleden" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 @@ -5662,6 +5663,11 @@ msgstr "" msgid "Access control list" msgstr "Toegangsopties" +#: include/class_acl.inc:1120 +#, fuzzy +msgid "ACL roles" +msgstr "Rechten" + #: include/class_acl.inc:1123 #, fuzzy msgid "Role name" @@ -5785,16 +5791,11 @@ msgstr "" "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u." "b. de 'config' regel in gosa.conf!" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, fuzzy, php-format msgid "LDAP server returned: %s" msgstr "LDAP server" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "Het opslaan van de FAI inhaker is mislukt" - #: include/functions.inc:699 #, fuzzy msgid "" @@ -6291,11 +6292,6 @@ msgstr "Toevoegen" msgid "Add %s" msgstr "Toevoegen" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Verwijderen" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6864,6 +6860,39 @@ msgstr "" "Help directory '%s' is niet toegankelijk. Er kunnen geen helpbestanden " "gelezen worden." +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Geactiveerd" + +#~ msgid "Active" +#~ msgstr "Actief" + +#~ msgid "Edit user" +#~ msgstr "Bewerk gebruiker" + +#~ msgid "and" +#~ msgstr "en" + +#, fuzzy +#~ msgid "Members:" +#~ msgstr "Groepsleden" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "Het opslaan van de FAI inhaker is mislukt" + +#, fuzzy +#~ msgid "Acl" +#~ msgstr "Alle" + +#, fuzzy +#~ msgid "Access control list templates" +#~ msgstr "Toegangsopties" + +#, fuzzy +#~ msgid "Acl roles" +#~ msgstr "Nieuw profiel" + #, fuzzy #~ msgid "User login failed." #~ msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'." diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po index 01eab4ef7..7509e0448 100644 --- a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: polski\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2007-07-14 21:45+0100\n" "Last-Translator: Piotr Rybicki \n" "Language-Team: Piotr Rybicki \n" @@ -188,7 +188,8 @@ msgstr "Dostępni członkowie" msgid "List message possible targets" msgstr "Wyświetl możliwe cele wiadomości" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "Członkowie" @@ -895,13 +896,6 @@ msgstr "" "Pomyślnie zmieniono hasło. Proszę pamiętać aby zmienić również ustawienia w " "programach skonfigurowanych do używania tego hasła." -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Wróć" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1059,11 +1053,11 @@ msgstr "Ta aplikacja nie jest już dostępna." #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "błąd LDAP:" @@ -1584,17 +1578,22 @@ msgid "grace time active" msgstr "Czas prolongaty aktywny" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "aktywne, hasło niezmienialne" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "aktywne, hasło wygasło" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "Aktywne" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "aktywne, hasło niezmienialne" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "aktywne, hasło wygasło" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "nieskonfigurowane" @@ -1987,7 +1986,8 @@ msgid "Template" msgstr "Szablon" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Edytuj" @@ -2107,11 +2107,7 @@ msgstr "Kopiuj ten obiekt" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Aktywne" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" +msgid "inactive" msgstr "Aktywne" #: plugins/admin/users/class_divListUsers.inc:328 @@ -2121,14 +2117,14 @@ msgstr "Aktywne" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "edytuj" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "Edytuj użytkownika" +#, fuzzy +msgid "user" +msgstr "użytkownicy" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2146,8 +2142,7 @@ msgstr "Brak uprawnień do zmiany własnego hasła w tym momencie" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "Usuń" @@ -2420,10 +2415,6 @@ msgstr "telefony" msgid "printers" msgstr "drukarki" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "i" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "Nieistniejące dn:" @@ -2735,6 +2726,12 @@ msgstr "Zamierzasz usunąć element %s." msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "Zamierzasz usunąć całe poddrzewo LDAP umieszczone pod '%s'." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Wróć" + #: plugins/admin/departments/tabs_department.inc:55 #, fuzzy msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" @@ -2928,18 +2925,23 @@ msgstr "" "żądaną operację." #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -msgid "Acl" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" msgstr "ACL" #: plugins/admin/acl/class_aclRole.inc:26 +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 #, fuzzy -msgid "Access control list templates" +msgid "Access control roles" msgstr "Kontrola dostępu" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "ACLe" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -2977,15 +2979,15 @@ msgstr "Góra" msgid "Down" msgstr "W dół" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 msgid "Edit ACL" msgstr "Edytuj ACL" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 msgid "Delete ACL" msgstr "Usuń ACL" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "Brak ustawień ACL w tej kategorii" @@ -2994,15 +2996,15 @@ msgstr "Brak ustawień ACL w tej kategorii" msgid "Contains ACLs for these objects: %s" msgstr "Zawiera ACL'e w tych kategoriach: %s" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 msgid "Edit categories ACLs" msgstr "Edytuj kategorie ACL'i" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "Wyczyść ACL'e kategorii" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "Edytuj ACL dla '%s', zakres to '%s'" @@ -3021,16 +3023,6 @@ msgstr "Nazwa obiektu" msgid "This role cannot be removed while it is in use by these objects:" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -#, fuzzy -msgid "ACL roles" -msgstr "ACLe" - -#: plugins/admin/acl/class_aclRole.inc:700 -#, fuzzy -msgid "Acl roles" -msgstr "Profil FAI" - #: plugins/admin/acl/remove.tpl:6 msgid "" "This includes all system and setup informations. Please double check if your " @@ -5175,11 +5167,6 @@ msgstr "%s%% trafień w pliku %s" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "Proces usuwania został anulowany przez dodatek '%s': %s" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "ACL" - #: include/class_tabs.inc:346 msgid "References" msgstr "Zależności" @@ -5340,11 +5327,10 @@ msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5471,9 +5457,30 @@ msgstr "Kontrola dostępu" msgid "Use ACL defined in role" msgstr "Użyj ACL zdefiniowanego w tej roli" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Usuń" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "Brak ustawień ACL w tej kategorii" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Kategoria" + +#: include/class_acl.inc:518 +#, fuzzy, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "Edytuj ACL dla '%s', zakres to '%s'" + #: include/class_acl.inc:665 include/class_acl.inc:672 #, fuzzy -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "Zaawansowane ustawienia telefonu" #: include/class_acl.inc:690 @@ -5514,9 +5521,9 @@ msgid "Complete object" msgstr "Utwórz obiekty" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "Nieznany typ ACL '%s', Nie wiem co z tym zrobic." +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "Nieznany wpis '%s'!" #: include/class_acl.inc:869 #, php-format @@ -5529,20 +5536,18 @@ msgid "Role: %s" msgstr "Pełniona funkcja" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "" +#, fuzzy +msgid "unknown role" +msgstr "! nieznane id" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "Zawiera ustawienia dla tych obiektów: %s" -#: include/class_acl.inc:948 -msgid "Members:" -msgstr "Członkowie:" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +#, fuzzy +msgid "ACL takes effect for all users" msgstr "ACL jest prawidłowy dla wszystkich użytkowników" #: include/class_acl.inc:1115 @@ -5550,6 +5555,11 @@ msgstr "ACL jest prawidłowy dla wszystkich użytkowników" msgid "Access control list" msgstr "Kontrola dostępu" +#: include/class_acl.inc:1120 +#, fuzzy +msgid "ACL roles" +msgstr "ACLe" + #: include/class_acl.inc:1123 #, fuzzy msgid "Role name" @@ -5672,16 +5682,11 @@ msgstr "" "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis " "'config' w gosa.conf!" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, fuzzy, php-format msgid "LDAP server returned: %s" msgstr "Serwer LDAP" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "Zapisywanie zaczepu FAI nieudane" - #: include/functions.inc:699 #, fuzzy msgid "" @@ -6170,11 +6175,6 @@ msgstr "Dodaj" msgid "Add %s" msgstr "Dodaj" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Usuń" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6738,6 +6738,40 @@ msgstr "" "Katalog pomocy '%s' nie jest osiągalny, nie można czytać żadnych plików " "pomocy." +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Aktywne" + +#~ msgid "Active" +#~ msgstr "Aktywne" + +#~ msgid "Edit user" +#~ msgstr "Edytuj użytkownika" + +#~ msgid "and" +#~ msgstr "i" + +#~ msgid "Unkown ACL type '%s'. Don't know how to handle it." +#~ msgstr "Nieznany typ ACL '%s', Nie wiem co z tym zrobic." + +#~ msgid "Members:" +#~ msgstr "Członkowie:" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "Zapisywanie zaczepu FAI nieudane" + +#~ msgid "Acl" +#~ msgstr "ACL" + +#, fuzzy +#~ msgid "Access control list templates" +#~ msgstr "Kontrola dostępu" + +#, fuzzy +#~ msgid "Acl roles" +#~ msgstr "Profil FAI" + #, fuzzy #~ msgid "User login failed." #~ msgstr "Logowanie użytkownika nieudane, odpowiedź serwera LDAP '%s'." diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po index 329f3af9a..b3fcfd6f4 100644 --- a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2005-04-18 14:35+0300\n" "Last-Translator: Igor Muratov \n" "Language-Team: ALT Linux Team\n" @@ -199,7 +199,8 @@ msgstr "Доступные приложения" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 #, fuzzy msgid "Members" msgstr "Включаемые объекты" @@ -915,13 +916,6 @@ msgstr "" "Вы успешно сменили свой пароль. Не забудьте изменить нужные настройки " "использующих его программ." -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "Назад" - #: plugins/personal/password/password.tpl:4 #, fuzzy msgid "" @@ -1082,11 +1076,11 @@ msgstr "У выбранного приложения нет параметров #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "Ошибка LDAP:" @@ -1632,21 +1626,24 @@ msgstr "Экспорт" msgid "grace time active" msgstr "" +#: plugins/personal/posix/class_posixAccount.inc:159 +#: plugins/personal/posix/class_posixAccount.inc:161 +#: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 +#, fuzzy +msgid "active" +msgstr "Личный" + #: plugins/personal/posix/class_posixAccount.inc:159 #, fuzzy -msgid "active, password not changable" +msgid "password not changable" msgstr "Новый пароль" #: plugins/personal/posix/class_posixAccount.inc:161 #, fuzzy -msgid "active, password expired" +msgid "password expired" msgstr "Срок действия пароля истекает" -#: plugins/personal/posix/class_posixAccount.inc:163 -#, fuzzy -msgid "active" -msgstr "Личный" - #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "Не настроено" @@ -2060,7 +2057,8 @@ msgid "Template" msgstr "Шаблон" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "Изменить" @@ -2195,12 +2193,7 @@ msgstr "Редактиовать объект" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "Личный" - -#: plugins/admin/users/class_divListUsers.inc:321 -#, fuzzy -msgid "Active" +msgid "inactive" msgstr "Личный" #: plugins/admin/users/class_divListUsers.inc:328 @@ -2210,16 +2203,15 @@ msgstr "Личный" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 #, fuzzy msgid "edit" msgstr "Изменить" #: plugins/admin/users/class_divListUsers.inc:329 #, fuzzy -msgid "Edit user" -msgstr "Пользователи домена" +msgid "user" +msgstr "пользователи" #: plugins/admin/users/class_divListUsers.inc:338 #, fuzzy @@ -2238,8 +2230,7 @@ msgstr "Вам не разрешено менять пароль." #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 #, fuzzy msgid "delete" msgstr "Удалить" @@ -2518,10 +2509,6 @@ msgstr "телефоны" msgid "printers" msgstr "принтеры" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "и" - #: plugins/admin/ogroups/class_ogroup.inc:470 #, fuzzy msgid "Non existing dn:" @@ -2856,6 +2843,12 @@ msgstr "Вы собираетесь удалить объект %s." msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"." +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "Назад" + #: plugins/admin/departments/tabs_department.inc:55 msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" msgstr "" @@ -3048,19 +3041,23 @@ msgid "" msgstr "" #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -#, fuzzy -msgid "Acl" -msgstr "Все" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "Доступ" #: plugins/admin/acl/class_aclRole.inc:26 +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 #, fuzzy -msgid "Access control list templates" +msgid "Access control roles" msgstr "Параметры доступа" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "Доступ" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -3103,17 +3100,17 @@ msgstr "" msgid "Down" msgstr "Домен" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 #, fuzzy msgid "Edit ACL" msgstr "Изменить" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 #, fuzzy msgid "Delete ACL" msgstr "Удалить" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 #, fuzzy msgid "No ACL settings for this category" msgstr "Описание группы" @@ -3123,16 +3120,16 @@ msgstr "Описание группы" msgid "Contains ACLs for these objects: %s" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 #, fuzzy msgid "Edit categories ACLs" msgstr "Список систем" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "" @@ -3151,16 +3148,6 @@ msgstr "Имя объекта" msgid "This role cannot be removed while it is in use by these objects:" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -#, fuzzy -msgid "ACL roles" -msgstr "Доступ" - -#: plugins/admin/acl/class_aclRole.inc:700 -#, fuzzy -msgid "Acl roles" -msgstr "Управление системами" - #: plugins/admin/acl/remove.tpl:6 #, fuzzy msgid "" @@ -5290,11 +5277,6 @@ msgstr "" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "Доступ" - #: include/class_tabs.inc:346 msgid "References" msgstr "Ссылки" @@ -5464,11 +5446,10 @@ msgstr "В вашем файле настройки отсутствуют зн #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5604,9 +5585,30 @@ msgstr "Параметры доступа" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "Удалить" + +#: include/class_acl.inc:465 +#, fuzzy +msgid "No ACL settings for this category!" +msgstr "Описание группы" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "Категория" + +#: include/class_acl.inc:518 +#, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "" + #: include/class_acl.inc:665 include/class_acl.inc:672 #, fuzzy -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "Настройки телефона" #: include/class_acl.inc:690 @@ -5652,9 +5654,9 @@ msgid "Complete object" msgstr "Включаемые объекты" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "" +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "состояние неизвестно" #: include/class_acl.inc:869 #, fuzzy, php-format @@ -5667,21 +5669,17 @@ msgid "Role: %s" msgstr "Роль" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "" +#, fuzzy +msgid "unknown role" +msgstr "состояние неизвестно" #: include/class_acl.inc:939 #, fuzzy, php-format msgid "Contains settings for these objects: %s" msgstr "Описание группы" -#: include/class_acl.inc:948 -#, fuzzy -msgid "Members:" -msgstr "Включаемые объекты" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 @@ -5689,6 +5687,11 @@ msgstr "" msgid "Access control list" msgstr "Параметры доступа" +#: include/class_acl.inc:1120 +#, fuzzy +msgid "ACL roles" +msgstr "Доступ" + #: include/class_acl.inc:1123 #, fuzzy msgid "Role name" @@ -5813,16 +5816,11 @@ msgstr "" "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config" "\" в файле gosa.conf!" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, fuzzy, php-format msgid "LDAP server returned: %s" msgstr "LDAP-сервер" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"." - #: include/functions.inc:699 #, fuzzy msgid "" @@ -6309,11 +6307,6 @@ msgstr "Добавить" msgid "Add %s" msgstr "Добавить" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "Удалить" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6890,6 +6883,41 @@ msgstr "Метод '%s' не описан в вашем файле конфиг msgid "Helpdir '%s' is not accessible, can't read any helpfiles." msgstr "" +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "Личный" + +#, fuzzy +#~ msgid "Active" +#~ msgstr "Личный" + +#, fuzzy +#~ msgid "Edit user" +#~ msgstr "Пользователи домена" + +#~ msgid "and" +#~ msgstr "и" + +#, fuzzy +#~ msgid "Members:" +#~ msgstr "Включаемые объекты" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"." + +#, fuzzy +#~ msgid "Acl" +#~ msgstr "Все" + +#, fuzzy +#~ msgid "Access control list templates" +#~ msgstr "Параметры доступа" + +#, fuzzy +#~ msgid "Acl roles" +#~ msgstr "Управление системами" + #, fuzzy #~ msgid "User login failed." #~ msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"." diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po index 8a466ae6e..820ad3022 100644 --- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po +++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-10 16:37+0100\n" +"POT-Creation-Date: 2008-03-10 19:32+0100\n" "PO-Revision-Date: 2007-06-03 12:27+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: Chinese Simplified \n" @@ -191,7 +191,8 @@ msgstr "" msgid "List message possible targets" msgstr "" -#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286 +#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948 +#: html/getxls.php:123 html/getxls.php:286 msgid "Members" msgstr "成员" @@ -885,13 +886,6 @@ msgid "" "configured to use it as well." msgstr "您已经成功更改口令。还要记住更改相关程序设定。" -#: plugins/personal/password/changed.tpl:9 -#: plugins/admin/departments/class_departmentManagement.inc:441 -#: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261 -#: setup/class_setup.inc:263 include/functions.inc:1550 -msgid "Back" -msgstr "返回" - #: plugins/personal/password/password.tpl:4 msgid "" "To change your personal password use the fields below. The changes take " @@ -1046,11 +1040,11 @@ msgstr "此应用程序不再可用。" #: include/class_MultiSelectWindow.inc:529 include/class_config.inc:228 #: include/class_acl.inc:1082 include/functions.inc:344 #: include/functions.inc:371 include/functions.inc:380 -#: include/functions.inc:409 include/functions.inc:652 -#: include/functions.inc:691 include/functions.inc:736 -#: include/functions.inc:2544 include/class_ldap.inc:649 -#: include/class_ldap.inc:1115 html/index.php:255 html/index.php:269 -#: html/index.php:282 +#: include/functions.inc:409 include/functions.inc:620 +#: include/functions.inc:652 include/functions.inc:691 +#: include/functions.inc:736 include/functions.inc:2544 +#: include/class_ldap.inc:649 include/class_ldap.inc:1115 html/index.php:255 +#: html/index.php:269 html/index.php:282 #, fuzzy msgid "LDAP error" msgstr "LDAP 错误:" @@ -1584,17 +1578,22 @@ msgid "grace time active" msgstr "时间限制激活" #: plugins/personal/posix/class_posixAccount.inc:159 -msgid "active, password not changable" -msgstr "活动，口令不可更改" - #: plugins/personal/posix/class_posixAccount.inc:161 -msgid "active, password expired" -msgstr "活动，口令过期" - #: plugins/personal/posix/class_posixAccount.inc:163 +#: plugins/admin/users/class_divListUsers.inc:321 msgid "active" msgstr "活动" +#: plugins/personal/posix/class_posixAccount.inc:159 +#, fuzzy +msgid "password not changable" +msgstr "活动，口令不可更改" + +#: plugins/personal/posix/class_posixAccount.inc:161 +#, fuzzy +msgid "password expired" +msgstr "活动，口令过期" + #: plugins/personal/posix/class_posixAccount.inc:208 msgid "unconfigured" msgstr "未配置" @@ -1994,7 +1993,8 @@ msgid "Template" msgstr "模板" #: plugins/admin/users/class_divListUsers.inc:183 -#: plugins/admin/groups/class_divListGroup.inc:190 +#: plugins/admin/groups/class_divListGroup.inc:190 include/class_acl.inc:429 +#: include/class_acl.inc:472 msgid "Edit" msgstr "编辑" @@ -2114,11 +2114,7 @@ msgstr "拷贝条目" #: plugins/admin/users/class_divListUsers.inc:318 #, fuzzy -msgid "Deactivated" -msgstr "活动" - -#: plugins/admin/users/class_divListUsers.inc:321 -msgid "Active" +msgid "inactive" msgstr "活动" #: plugins/admin/users/class_divListUsers.inc:328 @@ -2128,14 +2124,14 @@ msgstr "活动" #: plugins/admin/acl/class_aclRole.inc:405 #: plugins/admin/acl/class_divListACL.inc:242 #: plugins/admin/acl/class_divListACL.inc:264 -#: plugins/admin/groups/class_divListGroup.inc:293 include/class_acl.inc:429 -#: include/class_acl.inc:472 +#: plugins/admin/groups/class_divListGroup.inc:293 msgid "edit" msgstr "编辑" #: plugins/admin/users/class_divListUsers.inc:329 -msgid "Edit user" -msgstr "编辑用户" +#, fuzzy +msgid "user" +msgstr "用户" #: plugins/admin/users/class_divListUsers.inc:338 msgid "password" @@ -2153,8 +2149,7 @@ msgstr "现在您无权修改您的口令" #: plugins/admin/acl/class_aclRole.inc:406 #: plugins/admin/acl/class_divListACL.inc:252 #: plugins/admin/acl/class_divListACL.inc:268 -#: plugins/admin/groups/class_divListGroup.inc:302 include/class_acl.inc:430 -#: include/class_acl.inc:473 +#: plugins/admin/groups/class_divListGroup.inc:302 msgid "delete" msgstr "删除" @@ -2422,10 +2417,6 @@ msgstr "电话" msgid "printers" msgstr "打印机" -#: plugins/admin/ogroups/class_ogroup.inc:325 -msgid "and" -msgstr "和" - #: plugins/admin/ogroups/class_ogroup.inc:470 msgid "Non existing dn:" msgstr "不存在的 dn:" @@ -2738,6 +2729,12 @@ msgstr "您将要删除条目 %s。" msgid "You're about to delete the whole LDAP subtree placed under '%s'." msgstr "您将要删除 '%s' 下的整个 LDAP 子树。" +#: plugins/admin/departments/class_departmentManagement.inc:441 +#: setup/class_setup.inc:261 setup/class_setup.inc:263 +#: include/functions.inc:1550 +msgid "Back" +msgstr "返回" + #: plugins/admin/departments/tabs_department.inc:55 #, fuzzy msgid "Moving LDAP tree failed: destination tree is a subtree of the source!" @@ -2926,18 +2923,23 @@ msgid "" msgstr "您的浏览器不支持 iframe，请使用这个链接来执行请求的操作。" #: plugins/admin/acl/tabs_acl.inc:28 -#: plugins/admin/acl/class_divListACL.inc:259 -#, fuzzy -msgid "Acl" -msgstr "全部" +#: plugins/admin/acl/class_divListACL.inc:259 include/class_tabs.inc:343 +#: include/class_acl.inc:429 include/class_acl.inc:430 +#: include/class_acl.inc:1114 include/class_acl.inc:1115 +#: include/class_acl.inc:1120 +msgid "ACL" +msgstr "ACL" #: plugins/admin/acl/class_aclRole.inc:26 -msgid "Access control list templates" -msgstr "" +#: plugins/admin/acl/class_aclRole.inc:695 +#: plugins/admin/acl/class_aclRole.inc:700 +#, fuzzy +msgid "Access control roles" +msgstr "访问选项" #: plugins/admin/acl/class_aclRole.inc:27 #, fuzzy -msgid "Edit ACL roles" +msgid "Edit AC roles" msgstr "MAC 地址" #: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197 @@ -2979,17 +2981,17 @@ msgstr "上" msgid "Down" msgstr "关闭" -#: plugins/admin/acl/class_aclRole.inc:360 include/class_acl.inc:429 +#: plugins/admin/acl/class_aclRole.inc:360 #, fuzzy msgid "Edit ACL" msgstr "编辑" -#: plugins/admin/acl/class_aclRole.inc:361 include/class_acl.inc:430 +#: plugins/admin/acl/class_aclRole.inc:361 #, fuzzy msgid "Delete ACL" msgstr "删除" -#: plugins/admin/acl/class_aclRole.inc:398 include/class_acl.inc:465 +#: plugins/admin/acl/class_aclRole.inc:398 msgid "No ACL settings for this category" msgstr "" @@ -2998,16 +3000,16 @@ msgstr "" msgid "Contains ACLs for these objects: %s" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:405 include/class_acl.inc:472 +#: plugins/admin/acl/class_aclRole.inc:405 #, fuzzy msgid "Edit categories ACLs" msgstr "编辑分类" -#: plugins/admin/acl/class_aclRole.inc:406 include/class_acl.inc:473 +#: plugins/admin/acl/class_aclRole.inc:406 msgid "Clear categories ACLs" msgstr "" -#: plugins/admin/acl/class_aclRole.inc:422 include/class_acl.inc:518 +#: plugins/admin/acl/class_aclRole.inc:422 #, php-format msgid "Edit ACL for '%s', scope is '%s'" msgstr "" @@ -3026,15 +3028,6 @@ msgstr "对象名称" msgid "This role cannot be removed while it is in use by these objects:" msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用：" -#: plugins/admin/acl/class_aclRole.inc:695 include/class_acl.inc:1120 -#, fuzzy -msgid "ACL roles" -msgstr "MAC 地址" - -#: plugins/admin/acl/class_aclRole.inc:700 -msgid "Acl roles" -msgstr "" - #: plugins/admin/acl/remove.tpl:6 #, fuzzy msgid "" @@ -5132,11 +5125,6 @@ msgstr "%s%% 点击率于文件 %s" msgid "Delete process has been canceled by plugin '%s': %s" msgstr "删除进程被插件 '%s' 取消: %s" -#: include/class_tabs.inc:343 include/class_acl.inc:1114 -#: include/class_acl.inc:1115 include/class_acl.inc:1120 -msgid "ACL" -msgstr "ACL" - #: include/class_tabs.inc:346 msgid "References" msgstr "参考" @@ -5295,11 +5283,10 @@ msgstr "您的配置文件缺少 SID 和/或 RIDBASE！" #: include/class_log.inc:88 include/class_acl.inc:826 #: include/functions.inc:450 include/functions.inc:595 -#: include/functions.inc:620 include/functions.inc:681 -#: include/functions.inc:1068 include/functions.inc:1916 -#: include/functions.inc:1950 include/functions.inc:1970 -#: include/class_ldap.inc:592 include/class_ldap.inc:640 -#: include/class_CopyPasteHandler.inc:159 +#: include/functions.inc:681 include/functions.inc:1068 +#: include/functions.inc:1916 include/functions.inc:1950 +#: include/functions.inc:1970 include/class_ldap.inc:592 +#: include/class_ldap.inc:640 include/class_CopyPasteHandler.inc:159 #: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39 #, fuzzy msgid "Internal error" @@ -5427,9 +5414,29 @@ msgstr "访问选项" msgid "Use ACL defined in role" msgstr "" +#: include/class_acl.inc:430 include/class_acl.inc:473 +#: include/utils/class_msgPool.inc:262 +#, php-format +msgid "Delete" +msgstr "删除" + +#: include/class_acl.inc:465 +msgid "No ACL settings for this category!" +msgstr "" + +#: include/class_acl.inc:472 include/class_acl.inc:473 +#, fuzzy +msgid "category ACL" +msgstr "分类" + +#: include/class_acl.inc:518 +#, php-format +msgid "Edit ACL for '%s' - scope is '%s'" +msgstr "" + #: include/class_acl.inc:665 include/class_acl.inc:672 #, fuzzy -msgid "Show/Hide Advanced Settings" +msgid "Show/hide advanced settings" msgstr "高级电话设置" #: include/class_acl.inc:690 @@ -5475,9 +5482,9 @@ msgid "Complete object" msgstr "成员对象" #: include/class_acl.inc:826 -#, php-format -msgid "Unkown ACL type '%s'. Don't know how to handle it." -msgstr "" +#, fuzzy, php-format +msgid "Unkown ACL type '%s'!" +msgstr "未知 FAIstate %s" #: include/class_acl.inc:869 #, fuzzy, php-format @@ -5490,21 +5497,17 @@ msgid "Role: %s" msgstr "角色" #: include/class_acl.inc:931 -msgid "Unknown role, possibly removed" -msgstr "" +#, fuzzy +msgid "unknown role" +msgstr "! 未知 id" #: include/class_acl.inc:939 #, php-format msgid "Contains settings for these objects: %s" msgstr "" -#: include/class_acl.inc:948 -#, fuzzy -msgid "Members:" -msgstr "成员" - #: include/class_acl.inc:954 -msgid "ACL is valid for all users" +msgid "ACL takes effect for all users" msgstr "" #: include/class_acl.inc:1115 @@ -5512,6 +5515,11 @@ msgstr "" msgid "Access control list" msgstr "访问选项" +#: include/class_acl.inc:1120 +#, fuzzy +msgid "ACL roles" +msgstr "MAC 地址" + #: include/class_acl.inc:1123 #, fuzzy msgid "Role name" @@ -5633,16 +5641,11 @@ msgid "" "administrator!" msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目！" -#: include/functions.inc:605 include/functions.inc:620 +#: include/functions.inc:605 #, fuzzy, php-format msgid "LDAP server returned: %s" msgstr "LDAP 服务器" -#: include/functions.inc:620 -#, fuzzy, php-format -msgid "Adding a lock failed." -msgstr "保存 FAI 钩子失败" - #: include/functions.inc:699 #, fuzzy msgid "" @@ -6119,11 +6122,6 @@ msgstr "添加" msgid "Add %s" msgstr "添加" -#: include/utils/class_msgPool.inc:262 -#, php-format -msgid "Delete" -msgstr "删除" - #: include/utils/class_msgPool.inc:262 #, fuzzy, php-format msgid "Delete %s" @@ -6674,6 +6672,31 @@ msgstr "此类没有帮助文件" msgid "Helpdir '%s' is not accessible, can't read any helpfiles." msgstr "帮助目录 '%s' 不能访问，无法读取任何帮助文件。" +#, fuzzy +#~ msgid "Deactivated" +#~ msgstr "活动" + +#~ msgid "Active" +#~ msgstr "活动" + +#~ msgid "Edit user" +#~ msgstr "编辑用户" + +#~ msgid "and" +#~ msgstr "和" + +#, fuzzy +#~ msgid "Members:" +#~ msgstr "成员" + +#, fuzzy +#~ msgid "Adding a lock failed." +#~ msgstr "保存 FAI 钩子失败" + +#, fuzzy +#~ msgid "Acl" +#~ msgstr "全部" + #, fuzzy #~ msgid "User login failed." #~ msgstr "用户登录失败。LDAP 服务器返回 '%s'。" diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 198817bc4..a89015d44 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -23,7 +23,7 @@ class aclManagement extends plugin { /* Plugin definitions */ - var $plHeadline = "ACLs"; + var $plHeadline = "ACL"; var $plDescription = "Manage access control lists"; /* Dialog attributes */ diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc index e8297b74f..d26746fd1 100644 --- a/gosa-core/plugins/admin/acl/class_aclRole.inc +++ b/gosa-core/plugins/admin/acl/class_aclRole.inc @@ -23,8 +23,8 @@ class aclrole extends acl { /* Definitions */ - var $plHeadline= "Access control list templates"; - var $plDescription= "Edit ACL roles"; + var $plHeadline= "Access control roles"; + var $plDescription= "Edit AC roles"; /* attribute list for save action */ var $attributes= array('gosaAclTemplate',"cn","description"); @@ -127,7 +127,7 @@ class aclrole extends acl asort($this->aclObjects); /* Fill acl types */ - $this->aclTypes= array( "reset" => _("Reset ACLs"), + $this->aclTypes= array( "reset" => _("Reset ACL"), "one" => _("One level"), "base" => _("Current object"), "sub" => _("Complete subtree"), @@ -252,7 +252,7 @@ class aclrole extends acl continue; } - /* Ordinary ACLs */ + /* Ordinary ACL */ if (!isset($new_acl[$object])){ $new_acl[$object]= array(); } @@ -357,8 +357,8 @@ class aclrole extends acl $field2= array("string" => $this->assembleAclSummary($entry)); $action= ""; $action.= ""; - $action.= ""; - $action.= ""; + $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'"); $aclList->AddEntry(array($field1, $field2, $field3)); @@ -397,13 +397,13 @@ class aclrole extends acl if ($summary == ""){ $summary= ''._("No ACL settings for this category").''; } else { - $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary)); + $summary= sprintf(_("ACL for these objects: %s"), preg_replace('/, $/', '', $summary)); } $field1= array("string" => $dsc, "attach" => "style='width:140px'"); $field2= array("string" => $summary); - $action= ""; - $action.= ""; + $action= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'"); $aclList->AddEntry(array($field1, $field2, $field3)); } @@ -585,7 +585,7 @@ class aclrole extends acl msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, "", get_class())); } - /* Refresh users ACLs */ + /* Refresh users ACL */ $ui= get_userinfo(); $ui->loadACL(); session::set('ui',$ui); @@ -692,12 +692,12 @@ class aclrole extends acl { return (array( "plShortName" => _("Role"), - "plDescription" => _("ACL roles"), + "plDescription" => _("Access control roles"), "plSelfModify" => FALSE, "plDepends" => array(), "plPriority" => 0, "plSection" => array("admin"), - "plCategory" => array("aclroles" => array("objectClass" => "gosaRole", "description" => _("Acl roles"))), + "plCategory" => array("aclroles" => array("objectClass" => "gosaRole", "description" => _("Access control roles"))), "plProvidedAcls" => array( "cn" => _("Name"), diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc index de2b1c312..73d597de7 100644 --- a/gosa-core/plugins/admin/acl/class_divListACL.inc +++ b/gosa-core/plugins/admin/acl/class_divListACL.inc @@ -42,7 +42,7 @@ class divListACL extends MultiSelectWindow function divListACL (&$config, &$parent) { - MultiSelectWindow::MultiSelectWindow($config, "ACLs", "acl"); + MultiSelectWindow::MultiSelectWindow($config, "ACL", "acl"); $this->parent = &$parent; $this->ui = get_userinfo(); diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index f15d1b378..689033052 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -322,7 +322,7 @@ class ogroup extends plugin error_reporting(0); if (isset($type[1]) && preg_match('/[UGADSFOWTP]/', $type[1])){ $p2= $conv[$type[1]]; - $smarty->assign("combinedObjects", "$p1 "._("and")." $p2"); + $smarty->assign("combinedObjects", sprintf("'%s' and '%s'", $p1, $p2); } else { $smarty->assign("combinedObjects", "$p1"); } diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc index 5f27641fb..84afb606c 100644 --- a/gosa-core/plugins/admin/users/class_divListUsers.inc +++ b/gosa-core/plugins/admin/users/class_divListUsers.inc @@ -315,10 +315,10 @@ class divListUsers extends MultiSelectWindow if(isset($val['userPassword'][0]) && preg_match("/^\{[^\}]/",$val['userPassword'][0])){ if(preg_match("/^[^\}]*+\}!/",$val['userPassword'][0])){ $lock_status = ""; + alt='"._("inactive")."' name='toggle_lock_status_%KEY%'>"; }else{ $lock_status = ""; + alt='"._("active")."' name='toggle_lock_status_%KEY%'>"; } }else{ $lock_status = " "; @@ -326,7 +326,7 @@ class divListUsers extends MultiSelectWindow /* Generate edit icon */ $action.= ""; + name='user_edit_%KEY%' title='".msgPool::editButton(_("user"))."'>"; /* Add deactivate status if we are allowed to */ if (preg_match("/w/",$acl_all)){ diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 1b54695c1..b16ffab13 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -156,9 +156,9 @@ class posixAccount extends plugin $this->status.= ", "._("grace time active"); } } elseif (($this->shadowLastChange + $this->shadowMin) >= $current){ - $this->status= _("active, password not changable"); + $this->status= _("active").", "._("password not changable"); } elseif (($this->shadowLastChange + $this->shadowMax) >= $current){ - $this->status= _("active, password expired"); + $this->status= _("active").", "._("password expired"); } else { $this->status= _("active"); } @@ -1318,7 +1318,7 @@ class posixAccount extends plugin /* Should not happen */ if ($id == $hwm){ - msg_dialog::display(_("Error"), _("Cannot allocate a free ID: too many users!"), ERROR_DIALOG); + msg_dialog::display(_("Error"), _("Cannot allocate a free ID!"), ERROR_DIALOG); exit; }