diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index 756173776a..9fa00f128f 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -255,9 +255,9 @@ class addressbook_hooks 'size' => 60, 'label' => 'Default document to insert contacts', 'name' => 'default_document', - 'help' => lang('If you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. That icon allows to download the specified document with the contact data inserted.').' '. - lang('The document can contain placeholder like {{n_fn}}, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. - lang('At the moment the following document-types are supported:'). implode(',',bo_merge::get_file_extensions()), + 'help' => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('addressbook')).' '. + lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','','', 'n_fn').' '. + lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()), 'run_lang' => false, 'xmlrpc' => True, 'admin' => False, @@ -267,9 +267,9 @@ class addressbook_hooks 'size' => 60, 'label' => 'Directory with documents to insert contacts', 'name' => 'document_dir', - 'help' => lang('If you specify a directory (full vfs path) here, addressbook displays an action for each document. That action allows to download the specified document with the contact data inserted.').' '. - lang('The document can contain placeholder like {{n_fn}}, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. - lang('At the moment the following document-types are supported:'). implode(',',bo_merge::get_file_extensions()), + 'help' => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('addressbook')).' '. + lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','','','n_fn').' '. + lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()), 'run_lang' => false, 'xmlrpc' => True, 'admin' => False, diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index 68a6a02815..9c5de48f7a 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -185,7 +185,7 @@ class addressbook_merge extends bo_merge 'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'), 'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'), 'NENVLF' => lang('Example {{NELFNV role}} - if field role is not empty, set a LF without any value of the field'), - 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is emty for example'), + 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is empty for example'), 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'), ) as $name => $label) { diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index 5ef7c7f60c..529c8f8885 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -61,7 +61,6 @@ are you shure you want to delete this contact? addressbook en Are you sure you w are you sure you want to delete this field? addressbook en Are you sure you want to delete this field? assistent addressbook en Assistent assistent phone addressbook en Assistent phone -at the moment the following document-types are supported: addressbook en The following document types are supported: birthday common en Birthday birthdays common en Birthdays blank addressbook en Blank @@ -160,7 +159,6 @@ distribution lists addressbook en Distribution lists distribution lists, ... addressbook en Distribution lists, ... do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook? addressbook en Do you want another private address book, which can not be viewed by other users, if you grant access to your personal address book? do your really want to delete this contact? addressbook en Do you really want to delete this contact? -document '%1' does not exist or is not readable for you! addressbook en Document '%1' does not exist or is not readable by you! doesn't matter addressbook en Doesn't matter domestic addressbook en Domestic don't hide empty columns addressbook en Hide empty columns @@ -186,10 +184,7 @@ enter the path to the exported file here addressbook en Enter the path to the ex error deleting the contact !!! addressbook en Error deleting the contact! error saving the contact !!! addressbook en Error saving the contact! error: the entry has been updated since you opened it for editing! addressbook en Error: the entry has been updated since you opened it for editing! -example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms. addressbook en Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms. -example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller addressbook en Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller -example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role addressbook en Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role -example {{nelfnv role}} - if field role is not empty, set a lf without any value of the field addressbook en Example {{NELFNV role}} - if field role is not empty, set a LF without any value of the field +example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller preferences en Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller existing links addressbook en Existing links exists addressbook en Exists export addressbook en Export @@ -217,7 +212,6 @@ fields to copy when copying an address? admin en Fields to copy when copying an fields to show in address list addressbook en Fields to show in address list fieldseparator addressbook en Field separator fieldseperator addressbook en Field separator -for more then one contact in a document use the tag pagerepeat! addressbook en Use the tag page repeat for more than one contact in a document! for read only ldap admin en For read only LDAP for serial letter use this tag. put the content, you want to repeat between two tags. addressbook en Use this tag for serial letter. Place the content you want to repeat between two tags. freebusy uri addressbook en FreeBusy URI @@ -245,8 +239,6 @@ home zip code addressbook en Home ZIP code how many contacts should non-admins be able to export admin en How many contacts should non-admins be able to export. icon addressbook en Icon if accounts are already in ldap admin en If accounts are already in LDAP -if you specify a directory (full vfs path) here, addressbook displays an action for each document. that action allows to download the specified document with the contact data inserted. addressbook en If you specify a directory, full vfs path, address book displays an action for each document. That action allows to download the specified document with the contact data inserted. -if you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. that icon allows to download the specified document with the contact data inserted. addressbook en If you specify a document, full vfs path, address book displays an extra document icon for each address. That icon allows to download the specified document with the contact data inserted. if you specify an export definition, it will be used when you export addressbook en If you specify an export definition, it will be used when you export ignore first line addressbook en Ignore first line import addressbook en Import @@ -401,7 +393,6 @@ that field name has been used already ! addressbook en The field name has been u the anonymous user has probably no add rights for this addressbook. addressbook en The anonymous user has no add rights for this address book. the anonymous user needs add rights for it! addressbook en The anonymous user needs add rights! the anonymous user needs read it! addressbook en The anonymous user needs read rights! -the document can contain placeholder like $$n_fn$$, to be replaced with the contact data (%1full list of placeholder names%2). addressbook en The document can contain placeholder like $$n_fn$$, to be replaced with the contact data. %1Full list of placeholder names%2. the zip extension is needed, to insert contact data in openoffice or msoffice documents. addressbook en The zip extension is needed, to insert contact data in OpenOffice or MSOffice documents. there was an error saving your data :-( addressbook en ERROR saving data! this module displays a contactform, that stores direct into the addressbook. addressbook en This module displays a contact form, that stores directly into the address book. diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang index 0571b5cb48..4bc077b489 100644 --- a/etemplate/lang/egw_en.lang +++ b/etemplate/lang/egw_en.lang @@ -101,6 +101,7 @@ custom fields etemplate en Custom fields custom javascript for onchange etemplate en Custom javascript for onChange cut etemplate en Cut date+time etemplate en Date+Time +date preferences en Date datum etemplate en Datum day etemplate en Day days etemplate en Days @@ -130,7 +131,7 @@ displayed in statusline of browser if input-field gets focus etemplate en Displa displayed in the top line of the groupbox (legend) etemplate en Displayed in the top line of the group box (legend). do you want to save the changes you made in table %s? etemplate en Do you want to save the changes you made in table %s? do you want to send the message to all selected entries, without further editing? etemplate en Do you want to send the message to all selected entries, WITHOUT further editing? -document '%1' does not exist or is not readable for you! etemplate en Document '%1' does not exist or is not readable for you! +document '%1' does not exist or is not readable for you! preferences en Document '%1' does not exist or is not readable for you! documentation etemplate en Documentation doesn't matter etemplate en Doesn't matter drop a table - this can not be undone etemplate en Drop a table - this can NOT be undone @@ -168,6 +169,9 @@ etemplate '%1' written to '%2' etemplate en eTemplate '%1' written to '%2' etemplate editor etemplate en eTemplate editor etemplate reference etemplate en eTemplate reference etemplate tutorial etemplate en eTemplate tutorial +example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms. preferences en Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms. +example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role preferences en Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role +example {{nelfnv role}} - if field role is not empty, set a lf without any value of the field preferences en Example {{NELFNV role}} - if field role is not empty, set a LF without any value of the field exchange this row with the one above etemplate en Exchange this row with the one above exchange this two columns etemplate en Exchange these two columns export the loaded etemplate into a xml-file etemplate en Export the loaded eTemplate into a xml-file @@ -183,9 +187,10 @@ file writen etemplate en File written. fileupload etemplate en File upload first etemplate en First floating point etemplate en Floating point -for more then one contact in a document use the tag pagerepeat! etemplate en Use the tag page repeat for more than one contact in a document! +for more then one contact in a document use the tag pagerepeat! preferences en Use the tag page repeat for more than one contact in a document! foreign key etemplate en Foreign key formatted text (html) etemplate en Formatted text (HTML) +general fields: preferences en General fields: go to the first entry etemplate en Go to the first entry go to the last entry etemplate en Go to the last entry go to the next page of entries etemplate en Go to the next page of entries @@ -208,6 +213,8 @@ hours etemplate en Hours how many entries should the list show etemplate en How many entries should the list show html etemplate en HTML if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell etemplate en If field is disabled an empty table cell is displayed +if you specify a directory (full vfs path) here, %1 displays an action for each document. that action allows to download the specified document with the data inserted. preferences en If you specify a directory, full vfs path, %1 displays an action for each document. That action allows to download the specified document with the data inserted. +if you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. that icon allows to download the specified document with the data inserted. preferences en If you specify a document, full vfs path, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted. image etemplate en Image import etemplate en Import import an etemplate from a xml-file etemplate en Import an eTemplate from a xml-file @@ -391,6 +398,8 @@ template deleted etemplate en Template deleted. template saved etemplate en Template saved. text etemplate en Text textarea etemplate en Text area +the document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2). preferences en The document can contain placeholder like {{%3}}, to be replaced with the data. %1Full list of placeholder names%2. +the following document-types are supported: preferences en The following document types are supported: this text gets displayed if the input-field is empty and has no focus (blur) etemplate en Text gets displayed if the input field is empty and has no focus (blur) time etemplate en Time to disable: [! = not][=] eg: '!@data' disables if content of data is empty etemplate en To disable: [! = not][=] eg: '!@data' disables if content of data is empty