![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f1b7a4c)
raw | patch | inline | side by side (parent: f1b7a4c)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Fri, 6 Jul 2007 12:20:03 +0000 (12:20 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Fri, 6 Jul 2007 12:20:03 +0000 (12:20 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6757 594d385d-05f5-0310-b6e9-bd551577e9d8
16 files changed:
index 38b9109873e8cf8a3192b6338cfa640a433ef46e..787b49e73274e5d0c89fcf6ce2ac75a15085f88f 100644 (file)
-# $Id: kolab2.schema,v 1.12 2005/06/11 16:40:23 martin Exp $
+# $Id: kolab2.schema,v 1.22 2007/02/02 15:16:45 thomas Exp $
# (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
-# (c) 2003, 2004 Martin Konold <martin.konold@erfrakon.de>
+# (c) 2003-2006 Martin Konold <martin.konold@erfrakon.de>
# (c) 2003 Achim Frank <achim.frank@erfrakon.de>
#
# Redistribution and use in source and binary forms, with or without
# as provided by 3rd parties like OpenLDAP.
#
# slapd.conf then looks like
-# include /kolab/etc/openldap/schema/core.schema
-# include /kolab/etc/openldap/schema/cosine.schema
-# include /kolab/local/etc/openldap/schema/inetorgperson.schema
-# include /kolab/local/etc/openldap/schema/kolab2.schema
+# include /kolab/etc/openldap/schema/core.schema
+# include /kolab/etc/openldap/schema/cosine.schema
+# include /kolab/etc/openldap/schema/inetorgperson.schema
+# include /kolab/etc/openldap/schema/rfc2739.schema
+# include /kolab/etc/openldap/schema/kolab2.schema
#
####################
# kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the
# cleartext password. This is required in order to pass the password from
# the maintainance/administration application to the kolabHomeServer running the
-# resource handler application in a secure maner
+# resource handler application in a secure manner.
+# Actually this attribute is deprecated as of Kolab 2.1. Instead we grant the
+# calendar user dn: cn=calendar,cn=internal,dc=yourcompany,dc=com access to
+# the respective calendar folder using IMAP ACLs.
attributetype ( 1.3.6.1.4.1.19419.2.1.4
NAME 'kolabEncryptedPassword'
DESC 'base64 encoded public key encrypted Password'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-# hostname including the domain name like kolab-master.bsi.de
+# hostname including the domain name like kolab-master.yourcompany.com
attributetype ( 1.3.6.1.4.1.19414.2.1.5
NAME ( 'fqhostname' 'fqdnhostname' )
DESC 'Fully qualified Hostname including full domain component'
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-# fqdn of all hosts in a multi-location setup
+# fqdn of all hosts in a multi-location or cluster setup
attributetype ( 1.3.6.1.4.1.19414.2.1.6
NAME 'kolabHost'
DESC 'Multivalued -- list of hostnames in a Kolab setup'
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-# fqdn of the server containg the actual user data
+# fqdn of the server containg the actual user mailbox
attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
NAME 'kolabHomeServer'
DESC 'server which keeps the users mailbox'
# user@domain.tld: ACT_ALWAYS_ACCEPT
attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
- DESC 'Used by user, group and resource accounts to determine how to respond to invitations'
+ DESC 'defines how to respond to invitations'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
NAME 'kolabFreeBusyFuture'
DESC 'time in days for fb data towards the future'
EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE )
# time span from now to the past used for the free busy data
# measured in days
NAME 'kolabFreeBusyPast'
DESC 'time in days for fb data towards the past'
EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE )
# fqdn of the server as the default SMTP MTA
# not used in Kolab 2 currently as in Kolab 2 the
DESC 'fqdn of default MTA'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+ SINGLE-VALUE )
# Begin date of Kolab vacation period. Sender will
# be notified every kolabVacationResendIntervall days
NAME 'kolabVacationBeginDateTime'
DESC 'Begin date of vacation'
EQUALITY generalizedTimeMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+ SINGLE-VALUE )
# End date of Kolab vacation period. Sender will
# be notified every kolabVacationResendIntervall days
NAME 'kolabVacationEndDateTime'
DESC 'End date of vacation'
EQUALITY generalizedTimeMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+ SINGLE-VALUE )
# Intervall in days after which senders get
# another vacation message.
NAME 'kolabVacationResendInterval'
DESC 'Vacation notice interval in days'
EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27)
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE )
# Email recipient addresses which are handled by the
# vacation script. There can be multiple kolabVacationAddress
NAME 'kolabVacationReplyToUCE'
DESC 'Enable vacation notices to UCE'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7)
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
# Email recipient domains which are handled by the
# vacation script. There can be multiple kolabVacationReactDomain
NAME 'kolabForwardKeepCopy'
DESC 'Keep copy when forwarding'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
# Enable forwarding of UCE.
# Default is yes.
NAME 'kolabForwardUCE'
DESC 'Enable forwarding of mails known as UCE'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
+
+# comment when creating or deleting a kolab object
+# a comment might be appropriate. This is most useful
+# for tracability when users get moved to the graveyard
+# instead of being really deleted. Every entry must be prefixed
+# with an ISO 8601 date string e.g 200604301458Z. All times must
+# be in zulu timezone.
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.17
+ NAME 'kolabComment'
+ DESC 'multi-value comment'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
+
+# kolabFolderType describes the kind of Kolab folder
+# as defined in the kolab format specification.
+# We will annotate all folders with an entry
+# /vendor/kolab/folder-type containing the attribute
+# value.shared set to: <type>[.<subtype>].
+# The <type> can be: mail, event, journal, task, note,
+# or contact. The <subtype> for a mail folder can be
+# inbox, drafts, sentitems, or junkemail (this one holds
+# spam mails). For the other <type>s, it can only be
+# default, or not set. For other types of folders
+# supported by the clients, these should be prefixed with
+# "k-" for KMail, "h-" for Horde and "o-" for Outlook, and
+# look like for example "kolab.o-voicemail". Other third-party
+# clients shall use the "x-" prefix.
+# We then use the ANNOTATEMORE IMAP extension to
+# associate the folder type with a folder.
+attributetype ( 1.3.6.1.4.1.19414.2.1.7
+ NAME 'kolabFolderType'
+ DESC 'type of a kolab folder'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+ SINGLE-VALUE )
######################
# postfix attributes #
attributetype ( 1.3.6.1.4.1.19414.2.1.507
NAME 'postfix-enable-virus-scan'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.19414.2.1.508
NAME 'postfix-allow-unauthenticated'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.19414.2.1.509
NAME 'postfix-virtual'
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+attributetype ( 1.3.6.1.4.1.19414.2.1.510
+ NAME 'postfix-relayport'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
##########################
# cyrus imapd attributes #
##########################
attributetype ( 1.3.6.1.4.1.19414.2.1.601
NAME 'cyrus-autocreatequota'
EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.19414.2.1.602
NAME 'cyrus-admins'
attributetype ( 1.3.6.1.4.1.19414.2.1.603
NAME 'cyrus-imap'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
# enable legacy pop3
attributetype ( 1.3.6.1.4.1.19414.2.1.604
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+# cyrus imapd access control list
+# acls work with users and groups
+attributetype ( 1.3.6.1.4.1.19414.2.1.651
+ NAME 'acl'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
# enable secure imap
attributetype ( 1.3.6.1.4.1.19414.2.1.606
NAME 'cyrus-imaps'
postfix-mydestination $
postfix-mynetworks $
postfix-relayhost $
+ postfix-relayport $
postfix-transport $
postfix-virtual $
postfix-enable-virus-scan $
postfix-allow-unauthenticated $
- cyrus-autocreatequota $
cyrus-quotawarn $
cyrus-autocreatequota $
cyrus-admins $
uid $
userPassword ) )
-# shared folders are typically visible to everyone subscribed to
-# the server without the need for an extra login
+# public folders are typically visible to everyone subscribed to
+# the server without the need for an extra login. Subfolders are
+# defined using the hiarchy seperator '/' e.g. "sf/sub1". Please note
+# that the term public folder is prefered to shared folder because
+# normal user mailboxes can also share folders using acls.
objectclass ( 1.3.6.1.4.1.19414.2.2.9
NAME 'kolabSharedFolder'
DESC 'Kolab public shared folder'
SUP top AUXILIARY
MUST cn
MAY ( acl $
- alias $
+ alias $
cyrus-userquota $
kolabHomeServer $
+ kolabFolderType $
kolabDeleteflag ) )
-# used as a plain node for the LDAP tree. In contrast to unix filesystem directories
-# LDAP nodes can and often do also have contents/attributes. We use kolabNamedObject
-# in order to put more structure in the directory tree.
+# kolabNamedObject is used as a plain node for the LDAP tree.
+# In contrast to unix filesystem directories LDAP nodes can
+# and often do also have contents/attributes. We use the
+# kolabNamedObject in order to put some structure in the
+# LDAP directory tree.
objectclass ( 1.3.6.1.4.1.5322.13.1.1
NAME 'kolabNamedObject'
SUP top STRUCTURAL
kolabForwardAddress $
kolabForwardKeepCopy $
kolabForwardUCE $
- kolabDeleteflag ) )
+ kolabDeleteflag $
+ kolabComment ) )
# kolab organization with country support
objectclass ( 1.3.6.1.4.1.19414.3.2.3
kolabDeleteflag $
alias ) )
-# kolab groupOfNames with extra kolabDeleteflag and the required attribute mail.
-# The mail attribute for kolab objects of the type kolabGroupOfNames is not arbitrary but
-# MUST be a single attribute of the form cn@kolabdomain (e.g. employees@mydomain.com). The
-# mail attribute MUST be worldwide unique.
+# kolab groupOfNames with extra kolabDeleteflag and the required
+# attribute mail.
+# The mail attribute for kolab objects of the type kolabGroupOfNames
+# is not arbitrary but MUST be a single attribute of the form
+# of an valid SMTP address with the CN as the local part.
+# E.g cn@kolabdomain (e.g. employees@mydomain.com). The
+# mail attribute MUST be globally unique.
objectclass ( 1.3.6.1.4.1.19414.3.2.5
NAME 'kolabGroupOfNames'
DESC 'Kolab group of names (DNs) derived from RFC2256'
- SUP top AUXILIARY
- MUST ( member $ cn )
- MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description $ mail $ kolabDeleteflag ) )
+ SUP groupOfNames AUXILIARY
+ MAY ( mail $
+ kolabDeleteflag ) )
diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc
index 4e82dbdd7a9c9312b18e9127df5e42c2dc005968..6b18fe6ca64c831b6cf84350ad883703e19719a3 100755 (executable)
$this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
/* Add SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Display users matching"),"*" , true);
diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc
index c3a59151906c925885b8f3cc8d0416205c2cd143..206fca72cf6ab722bcb01b243d4913f3f7a04c72 100755 (executable)
/* Add SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching department names"), "*" , true);
index 7be1906dbf7d85e237d638f2122096d5b699bf3f..e4831a17b84ccb8387fdc1061f1e162ca15ffc0b 100644 (file)
/* Add SubSearch checkbox */
//$this->AddCheckBox(SEPERATOR);
- //$this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ //$this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Display users matching"),"*" , true);
diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index d08d22cd14c3bbbb3556ce20f7b106b097b29355..b135b8bab2d186fd758712869ea896681e84a26a 100644 (file)
$this->AddCheckBox(SEPERATOR);
/* Add SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching group names"), "*" , true);
diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc
index 87b7bbaa4524b4e7c499c026164720767303b1b7..c392ccff53b43c797894782bd99c595e34438330 100755 (executable)
$this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
/* Add SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Display mime types matching"),"*" , true);
diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 24607ab6094b41b7dde77b10fa261f2e2fea90b2..42ff98650c74df759af38594cfc24cd5cde632ce 100755 (executable)
/* Add SubSearch checkbox */
$this->AddCheckBox(SEPERATOR);
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching group names"), "*" , true);
index fc5f158a16e062611d8246e40592af7b3c581f42..663b602746760ed01c8286f12cfcf05de5296b6d 100644 (file)
<input type=checkbox name="phones" value="1" {$phones} onClick="mainform.submit()" title="{t}Select to see phones{/t}">{t}Show phones{/t}<br>
</p>
<p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
- <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Ignore subtrees{/t}<br>
+ <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}<br>
</p>
<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle title="{t}Display objects of department{/t}">
diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index edc65f0a4f6057c7f0fe0a891c97d55de694f9e9..8db1bfec837189c2a7659d32c4432b7153906936 100644 (file)
/* Add SubSearch checkbox */
$this->AddCheckBox(SEPERATOR);
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Display systems matching"),"*" , true);
diff --git a/plugins/admin/systems/selectUserToPrinterDialog.tpl b/plugins/admin/systems/selectUserToPrinterDialog.tpl
index 5cd8e152ab1554b44a4c2f52900fd6b031b5037f..c60be22972c458f4bdd6236ea6051628c41f5f35 100644 (file)
<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
<tr>
<td>
- <input type='checkbox' name='SubSearch' value='1' title='{t}Select to search within subtrees{/t}' onClick='document.mainform.submit();' {$subtree}> {t}Ignore subtrees{/t}
+ <input type='checkbox' name='SubSearch' value='1' title='{t}Select to search within subtrees{/t}' onClick='document.mainform.submit();' {$subtree}> {t}Search in subtrees{/t}
</td>
</tr>
</table>
diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index 88af3d7f1a29534f3efb298d261bdedec56046ba..0188b87e761a2ddff9503bf60675817a3404380f 100644 (file)
/* Add SubSearch checkbox */
$this->AddCheckBox(SEPERATOR);
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Display users matching"),"*" , true);
diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc
index 0d09ea54bcf50cc85923c3b4c1504df61cb2cb0c..b8d15f48a55042cd6eed653c8e62458779e6528c 100755 (executable)
$this->AddCheckBox("ShowReceiveBlocklists" , _("Select to see receive blocklists"), _("Show receive blocklists"),true);
$this->AddCheckBox(SEPERATOR);
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching list names"),"*" , true);
diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc
index feafc1a3f8d7eb27a14adcc2c8a1dc615e75ddb3..f094122983de744ac4dc9b0f443851274746f746 100755 (executable)
$this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
/* Add Checkboxes / SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching conference names"),"*" , true);
diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc
index 0c16a67ecc62c3de213bf2d983a66a5e1b6c6dc8..71cde86143a0308e6f883cf461feea139e39cd2e 100755 (executable)
$this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'" ));
/* Add Checkboxes / SubSearch checkbox */
- $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false);
+ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Search in subtrees"), false);
/* Name ,Text ,Default , Connect with alphabet */
$this->AddRegex ("Regex", _("Regular expression for matching macro names"),"*" , true);
diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index e58f71465fbe0b378e6c48ab165f6451f1b53408..95af082eceee7bb60b8cd643e8c6e5f815e2e300 100644 (file)
</table>
<table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">
<tr><td>
- <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Ignore subtrees{/t}
+ <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}
</tr></td>
</table>
<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
index ca3ae3ec5825979e2ced3e347b68fc9074a6cb6d..3a487274e7495afe8a150b894a6bcbabee8ba762 100644 (file)
<td>
<input type="checkbox" name="SubSearch" value="1" {$SubSearchCHK}
onClick="mainform.submit();">
- {t}Ignore subtrees{/t}
+ {t}Search in subtrees{/t}
</td>
</tr>
</table>