From f1154163b0a9efb21d722bc658352739040ffd61 Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 28 Apr 2007 18:07:12 +0000 Subject: Merged branch devel-addressbook from r443 back to trunk --- program/localization/en_US/labels.inc | 12 ++---------- program/localization/en_US/messages.inc | 9 ++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'program/localization/en_US') diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 530a8ece5..201af0bd5 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -182,16 +182,8 @@ $labels['firstpage'] = 'Show first set'; $labels['nextpage'] = 'Show next set'; $labels['lastpage'] = 'Show last set'; - -// LDAP search -$labels['ldapsearch'] = 'LDAP directory search'; - -$labels['ldappublicsearchname'] = 'Contact name'; -$labels['ldappublicsearchtype'] = 'Exact match?'; -$labels['ldappublicserverselect'] = 'Select servers'; -$labels['ldappublicsearchfield'] = 'Search on'; -$labels['ldappublicsearchform'] = 'Look for a contact'; -$labels['ldappublicsearch'] = 'Search'; +$labels['groups'] = 'Groups'; +$labels['personaladrbook'] = 'Personal Addresses'; // settings diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 51cc313c7..bb132a583 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -38,6 +38,8 @@ $messages['contactexists'] = 'A contact with this e-mail address already exists' $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.'; $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!'; $messages['nocontactsfound'] = 'No contacts found'; +$messages['contactnotfound'] = 'The requested contact was not found'; + $messages['sendingfailed'] = 'Failed to send message'; $messages['errorsaving'] = 'An error occured while saving'; $messages['errormoving'] = 'Could not move the message'; @@ -69,4 +71,9 @@ $messages['messageopenerror'] = 'Could not load message from server'; $messages['fileuploaderror'] = 'File upload failed'; $messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size'; -?> \ No newline at end of file +$messages['copysuccess'] = 'Successfully copied $nr addresses'; +$messages['copyerror'] = 'Could not copy any addresses'; +$messages['sourceisreadonly'] = 'This address source is read only'; +$messages['errorsavingcontact'] = 'Could not save the contact address'; + +?> -- cgit v1.2.3