From 0501b637a3177cce441166b5fcfe27c9bd9fbe0f Mon Sep 17 00:00:00 2001 From: thomascube Date: Tue, 18 Jan 2011 18:00:57 +0000 Subject: Merge branch devel-addressbook (r4193:4382) back into trunk --- program/localization/en_US/messages.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/localization/en_US/messages.inc') diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index cca6e916a..df347d1db 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -104,7 +104,7 @@ $messages['forbiddencharacter'] = 'Folder name contains a forbidden character'; $messages['selectimportfile'] = 'Please select a file to upload'; $messages['addresswriterror'] = 'The selected address book is not writeable'; $messages['contactaddedtogroup'] = 'Successfully added the contacts to this group'; -$messages['contactremovedfromgroup'] = 'Successfully remove contacts from this group'; +$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group'; $messages['importwait'] = 'Importing, please wait...'; $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; $messages['importconfirm'] = 'Successfully imported $inserted contacts, $skipped existing entries skipped:

$names

'; @@ -137,5 +137,6 @@ $messages['namecannotbeempty'] = 'Name cannot be empty'; $messages['nametoolong'] = 'Name is too long'; $messages['folderupdated'] = 'Folder updated successfully'; $messages['foldercreated'] = 'Folder created successfully'; +$messages['invalidimageformat'] = 'Not a valid image format'; ?> -- cgit v1.2.3